Changeset 28323

Timestamp:

05/06/2014 09:14:35 PM (11 years ago)

Author:

wonderboymusic

Message:

In wp-includes/comment-template.php, remove dead code:

• In get_comment_reply_link(), $link is set twice before it is used.
• In Walker_Comment::start_lvl(), case 'ul': is unreachable unless placed before default:.
• In Walker_Comment::end_lvl(), case 'ul': is unreachable unless placed before default:.
• In comment_form(), $id is conditionally set and never used.

See #27882.

File:

• trunk/src/wp-includes/comment-template.php (modified) (4 diffs)

trunk/src/wp-includes/comment-template.php

@@ -1319 +1319 @@
         return false;
 
-    $link = '';
-
     if ( get_option('comment_registration') && ! is_user_logged_in() )
         $link = '<a rel="nofollow" class="comment-reply-login" href="' . esc_url( wp_login_url( get_permalink() ) ) . '">' . $login_text . '</a>';
@@ -1585 +1583 @@
                 $output .= '<ol class="children">' . "\n";
                 break;
+            case 'ul':
             default:
-            case 'ul':
                 $output .= '<ul class="children">' . "\n";
                 break;
@@ -1612 +1610 @@
                 $output .= "</ol><!-- .children -->\n";
                 break;
+            case 'ul':
             default:
-            case 'ul':
                 $output .= "</ul><!-- .children -->\n";
                 break;
@@ -2046 +2044 @@
     if ( null === $post_id )
         $post_id = get_the_ID();
-    else
-        $id = $post_id;
 
     $commenter = wp_get_current_commenter();