Ticket #8973: 8973.diff

wp-includes/comment.php

@@ -797 +797 @@
 
         $comtypewhere = ( 'all' != $args['type'] && isset($allowedtypes[$args['type']]) ) ? " AND comment_type = '" . $allowedtypes[$args['type']] . "'" : '';
 
-        // 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_approved = '1' AND comment_date_gmt < '%s'" . $comtypewhere, $comment->comment_post_ID, $comment->comment_date_gmt ) );
+        // Count comments older than this one, including this user's unmoderated comments
+        $current_user = wp_get_current_user();
+        $current_commenter = wp_get_current_commenter();
+        
+        if ( $comment->user_id && $comment->user_id == $current_user->id )
+                $oldercoms = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_parent = 0 AND ( comment_approved = '1' OR ( user_id = %d AND comment_approved = '0' ) ) AND comment_date_gmt < %s" . $comtypewhere, $comment->comment_post_ID, $comment->user_id, $comment->comment_date_gmt ) );
+        elseif ( $current_commenter['comment_author'] == $comment->comment_author && $current_commenter['comment_author_email'] == $comment->comment_author_email )
+                $oldercoms = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_parent = 0 AND ( comment_approved = '1' OR ( comment_author = %s AND comment_author_email = %s AND comment_approved = '0' ) ) AND comment_date_gmt < %s" . $comtypewhere, $comment->comment_post_ID, $comment->comment_author, $comment->comment_author_email, $comment->comment_date_gmt ) );
+        else
+                $oldercoms = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_parent = 0 AND comment_approved = '1' AND comment_date_gmt < %s" . $comtypewhere, $comment->comment_post_ID, $comment->comment_date_gmt ) );
 
         // No older comments? Then it's page #1.
         if ( 0 == $oldercoms )