Ticket #35511: 35511.diff

comment-template.php

@@ -730 +730 @@
                  * If the default page displays the oldest comments, the permalinks for comments on the default page
                  * do not need a 'cpage' query var.
                  */
-                $default_comments_page = get_option( 'default_comments_page' );
                 if ( 'oldest' === get_option( 'default_comments_page' ) && 1 === $cpage ) {
                         $cpage = '';
                 }
@@ -1249 +1248 @@
  *                                  Default false.
  */
 function comments_template( $file = '/comments.php', $separate_comments = false ) {
-        global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity, $overridden_cpage;
+        global $wp_query, $withcomments, $post, $user_ID, $overridden_cpage;
 
         if ( !(is_single() || is_page() || $withcomments) || empty($post) )
                 return;
@@ -1277 +1276 @@
         /*
          * The url of the current comment author escaped for use in attributes.
          */
-        $comment_author_url = esc_url($commenter['comment_author_url']);
-
         $comment_args = array(
                 'orderby' => 'comment_date_gmt',
                 'order' => 'ASC',
@@ -1300 +1297 @@
                 $comment_args['include_unapproved'] = array( $comment_author_email );
         }
 
-        $per_page = 0;
         if ( get_option( 'page_comments' ) ) {
                 $per_page = (int) get_query_var( 'comments_per_page' );
                 if ( 0 === $per_page ) {
@@ -1401 +1397 @@
 
         if ( $separate_comments ) {
                 $wp_query->comments_by_type = separate_comments($comments);
-                $comments_by_type = &$wp_query->comments_by_type;
         } else {
                 $wp_query->comments_by_type = array();
         }