Changeset 9522

Timestamp:

11/05/2008 07:09:20 AM (16 years ago)

Author:

markjaquith

Message:

Massive get_comment_link() performance improvements for posts with a lot of comments. props Viper007Bond. fixes #7956

Location:

trunk/wp-includes

Files:

• comment-template.php (modified) (3 diffs)
• comment.php (modified) (2 diffs)
• widgets.php (modified) (2 diffs)

trunk/wp-includes/comment-template.php

@@ -436 +436 @@
  *
  * @param object|string|int $comment Comment to retrieve.
+ * @param string|int $page The comment's page if known. Optional. Avoids extra database query.
  * @return string The permalink to the current comment
  */
-function get_comment_link($comment = null) {
+function get_comment_link( $comment = null, $page = null ) {
     global $wp_rewrite;
 
@@ -444 +445 @@
 
     if ( get_option('page_comments') ) {
-        $page = get_page_of_comment( $comment->comment_ID );
+        $page = ( null !== $page ) ? (int) $page : get_page_of_comment( $comment->comment_ID );
 
         if ( $wp_rewrite->using_permalinks() )
@@ -1151 +1152 @@
 <?php endif; ?>
 
-        <div class="comment-meta commentmetadata"><a 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','&nbsp;&nbsp;','') ?></div>
+        <div class="comment-meta commentmetadata"><a href="<?php echo htmlspecialchars( get_comment_link( $comment->comment_ID, $page ) ) ?>"><?php printf(__('%1$s at %2$s'), get_comment_date('F jS, Y'),  get_comment_time()) ?></a><?php edit_comment_link('edit','&nbsp;&nbsp;','') ?></div>
 
         <?php comment_text() ?>

trunk/wp-includes/comment.php

@@ -553 +553 @@
  */
 function get_page_of_comment( $comment_ID, $per_page = null, $threaded = null ) {
+    global $wpdb;
+
     if ( !$comment = get_comment( $comment_ID ) )
         return;
@@ -569 +571 @@
         return get_page_of_comment( $comment->comment_parent, $per_page, $threaded );
 
-    $comments = get_comments( array( 'post_id' => $comment->comment_post_ID, 'order' => 'ASC' ) );
-
-    // Start going through the comments until we find what page number the above top level comment is on
-    $page = 1;
-    $comthispage = 0;
-    foreach ( $comments as $com ) {
-        if ( $threaded && 0 != $com->comment_parent )
-            continue;
-
-        if ( $com->comment_ID == $comment->comment_ID )
-            return $page;
-
-        $comthispage++;
-
-        if ( $comthispage >= $per_page ) {
-            $page++;
-            $comthispage = 0;
-        }
-    }
+    // Count comments older than this one
+    $oldercoms = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_parent = 0 AND comment_date_gmt < '%s'", $comment->comment_post_ID, $comment->comment_date_gmt ) );
+
+    // No older comments? Then it's page #1.
+    if ( 0 == $oldercoms )
+        return 1;
+
+    // Divide comments older than this one by comments per page to get this comment's page number
+    return ceil( ( $oldercoms + 1 ) / $per_page );
 }
 

trunk/wp-includes/widgets.php

@@ -1388 +1388 @@
 
     if ( !$comments = wp_cache_get( 'recent_comments', 'widget' ) ) {
-        $comments = $wpdb->get_results("SELECT comment_author, comment_author_url, comment_ID, comment_post_ID FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT $number");
+        $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT $number");
         wp_cache_add( 'recent_comments', $comments, 'widget' );
     }
@@ -1397 +1397 @@
             <ul id="recentcomments"><?php
             if ( $comments ) : foreach ( (array) $comments as $comment) :
-            echo  '<li class="recentcomments">' . sprintf(__('%1$s on %2$s'), get_comment_author_link(), '<a href="'. get_permalink($comment->comment_post_ID) . '#comment-' . $comment->comment_ID . '">' . get_the_title($comment->comment_post_ID) . '</a>') . '</li>';
+            echo  '<li class="recentcomments">' . sprintf(__('%1$s on %2$s'), get_comment_author_link(), '<a href="'. get_comment_link($comment->comment_ID) . '">' . get_the_title($comment->comment_post_ID) . '</a>') . '</li>';
             endforeach; endif;?></ul>
         <?php echo $after_widget; ?>