Ticket #7956: 7956.3.patch
File 7956.3.patch, 3.9 KB (added by , 16 years ago) |
---|
-
wp-includes/canonical.php
249 249 if ( $compare_original !== $compare_redirect ) { 250 250 $redirect_url = $redirect['scheme'] . '://' . $redirect['host']; 251 251 if ( !empty($redirect['port']) ) 252 252 $redirect_url .= ':' . $redirect['port']; 253 253 $redirect_url .= $redirect['path']; 254 254 if ( !empty($redirect['query']) ) 255 255 $redirect_url .= '?' . $redirect['query']; 256 256 } 257 257 258 258 if ( !$redirect_url || $redirect_url == $requested_url ) 259 259 return false; 260 260 261 261 // Note that you can use the "redirect_canonical" filter to cancel a canonical redirect for whatever reason by returning FALSE 262 262 $redirect_url = apply_filters('redirect_canonical', $redirect_url, $requested_url); 263 263 264 264 if ( !$redirect_url || $redirect_url == $requested_url ) // yes, again -- in case the filter aborted the request 265 265 return false; 266 266 267 267 if ( $do_redirect ) { 268 268 // protect against chained redirects -
wp-includes/comment-template.php
412 412 */ 413 413 function get_comment_link($comment = null) { 414 414 $comment = get_comment($comment); 415 return get_permalink( $comment->comment_post_ID ) . '#comment-' . $comment->comment_ID; 415 416 if ( get_option('page_comments') ) 417 return add_query_arg( 'gotocom', $comment->comment_ID, get_permalink( $comment->comment_post_ID ) ); 418 else 419 return get_permalink( $comment->comment_post_ID ) . '#comment-' . $comment->comment_ID; 416 420 } 417 421 418 422 /** … … 1085 1089 <br /> 1086 1090 <?php endif; ?> 1087 1091 1088 <div class="comment-meta commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php printf(__('%1$s at %2$s'), get_comment_date('F jS, Y'), get_comment_time()) ?></a><?php edit_comment_link('edit',' ','') ?></div>1092 <div class="comment-meta commentmetadata"><a rel="nofollow" href="<?php echo htmlspecialchars( get_comment_link( $comment->comment_ID ) ) ?>"><?php printf(__('%1$s at %2$s'), get_comment_date('F jS, Y'), get_comment_time()) ?></a><?php edit_comment_link('edit',' ','') ?></div> 1089 1093 1090 1094 <?php echo apply_filters('comment_text', get_comment_text()) ?> 1091 1095 -
wp-includes/comment.php
520 520 } 521 521 522 522 /** 523 * Calculate what page number a comment will appear on for comment paging. 524 * 525 * @since 2.7.0 526 * 527 * @param int $comment_ID Comment ID. 528 * @param int $per_page Optional comments per page. 529 * @return int|null Comment page number or null on error. 530 */ 531 function get_page_of_comment( $comment_ID, $per_page = null, $threaded = null ) { 532 if ( !$comment = get_comment( $comment_ID ) ) 533 return; 534 535 if ( !get_option('page_comments') ) 536 return 1; 537 538 $comments = array_reverse( get_comments( $comment->comment_post_ID ) ); 539 540 if ( null === $per_page ) 541 $per_page = get_option('comments_per_page'); 542 543 if ( null === $threaded ) 544 $threaded = get_option('thread_comments'); 545 546 // Find this comment's top level parent 547 if ( $threaded ) { 548 while ( 0 != $comment->comment_parent ) 549 $comment = get_comment( $comment->comment_parent ); 550 } 551 552 // Start going through the comments until we find what page number the above top level comment is on 553 $page = 1; 554 $comthispage = 0; 555 foreach ( $comments as $com ) { 556 if ( $threaded && 0 != $com->comment_parent ) 557 continue; 558 559 if ( $com->comment_ID == $comment->comment_ID ) 560 return $page; 561 562 $comthispage++; 563 564 if ( $comthispage >= $per_page ) { 565 $page++; 566 $comthispage = 0; 567 } 568 } 569 } 570 571 /** 523 572 * Does comment contain blacklisted characters or words. 524 573 * 525 574 * @since 1.5.0