Changeset 29908

Timestamp:

10/15/2014 09:55:31 PM (10 years ago)

Author:

ocean90

Message:

Comments: Don't print an empty HTML markup when comment_reply_link() returns no link.

props obenland.
fixes #29895.

File:

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

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

@@ -1840 +1840 @@
         <?php comment_text( get_comment_id(), array_merge( $args, array( 'add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
 
-        <div class="reply">
-            <?php comment_reply_link( array_merge( $args, array( 'add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
-        </div>
+        <?php
+        comment_reply_link( array_merge( $args, array(
+            'add_below' => $add_below,
+            'depth'     => $depth,
+            'max_depth' => $args['max_depth'],
+            'before'    => '<div class="reply">',
+            'after'     => '</div>'
+        ) ) );
+        ?>
+
         <?php if ( 'div' != $args['style'] ) : ?>
         </div>
@@ -1890 +1897 @@
                 </div><!-- .comment-content -->
 
-                <div class="reply">
-                    <?php comment_reply_link( array_merge( $args, array( 'add_below' => 'div-comment', 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
-                </div><!-- .reply -->
+                <?php
+                comment_reply_link( array_merge( $args, array(
+                    'add_below' => 'div-comment',
+                    'depth'     => $depth,
+                    'max_depth' => $args['max_depth'],
+                    'before'    => '<div class="reply">',
+                    'after'     => '</div>'
+                ) ) );
+                ?>
             </article><!-- .comment-body -->
 <?php