Changeset 26353

Timestamp:

11/24/2013 02:58:48 PM (11 years ago)

Author:

nacin

Message:

Add echo arguments to wp_list_comments() and Walker_Comment, allowing non-echo usage.

props mikelittle.
fixes #10948.

File:

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

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

@@ -1518 +1518 @@
                 break;
             case 'ol':
-                echo '<ol class="children">' . "\n";
+                $output .= '<ol class="children">' . "\n";
                 break;
             default:
             case 'ul':
-                echo '<ul class="children">' . "\n";
+                $output .= '<ul class="children">' . "\n";
                 break;
         }
@@ -1545 +1545 @@
                 break;
             case 'ol':
-                echo "</ol><!-- .children -->\n";
+                $output .= "</ol><!-- .children -->\n";
                 break;
             default:
             case 'ul':
-                echo "</ul><!-- .children -->\n";
+                $output .= "</ul><!-- .children -->\n";
                 break;
         }
@@ -1624 +1624 @@
 
         if ( !empty( $args['callback'] ) ) {
+            ob_start();
             call_user_func( $args['callback'], $comment, $args, $depth );
+            $output .= ob_get_clean();
             return;
         }
 
         if ( ( 'pingback' == $comment->comment_type || 'trackback' == $comment->comment_type ) && $args['short_ping'] ) {
+            ob_start();
             $this->ping( $comment, $depth, $args );
+            $output .= ob_get_clean();
         } elseif ( 'html5' === $args['format'] ) {
+            ob_start();
             $this->html5_comment( $comment, $depth, $args );
+            $output .= ob_get_clean();
         } else {
+            ob_start();
             $this->comment( $comment, $depth, $args );
+            $output .= ob_get_clean();
         }
     }
@@ -1651 +1659 @@
     function end_el( &$output, $comment, $depth = 0, $args = array() ) {
         if ( !empty( $args['end-callback'] ) ) {
+            ob_start();
             call_user_func( $args['end-callback'], $comment, $args, $depth );
+            $output .= ob_get_clean();
             return;
         }
         if ( 'div' == $args['style'] )
-            echo "</div><!-- #comment-## -->\n";
+            $output .= "</div><!-- #comment-## -->\n";
         else
-            echo "</li><!-- #comment-## -->\n";
+            $output .= "</li><!-- #comment-## -->\n";
     }
 
@@ -1802 +1812 @@
  *                                      Default 'html5' if the theme supports it. Accepts 'html5', 'xhtml'.
  *     @type bool   'short_ping'        Whether to output short pings. Default false.
+ *     @type bool   'echo'              Whether to echo the output or return it. Default true.
  * }
  * @param array $comments Optional. Array of comment objects. @see WP_Query->comments
@@ -1827 +1838 @@
         'format'            => current_theme_supports( 'html5', 'comment-list' ) ? 'html5' : 'xhtml',
         'short_ping'        => false,
+        'echo'              => true,
     );
 
@@ -1895 +1907 @@
         $walker = new Walker_Comment;
 
-    $walker->paged_walk($_comments, $max_depth, $page, $per_page, $r);
+    $output = $walker->paged_walk($_comments, $max_depth, $page, $per_page, $r);
     $wp_query->max_num_comment_pages = $walker->max_pages;
 
     $in_comment_loop = false;
+
+    if ( $r['echo'] )
+        echo $output;
+    else
+        return $output;
 }