Changeset 6317 for trunk/src/includes/replies/functions.php

Timestamp:

02/26/2017 08:15:20 AM (8 years ago)

Author:

johnjamesjacoby

Message:

Replies: Ensure hierarchical replies are correctly wrapped & concatenated into their output buffers in the correct order.

This updates the walker class to not immediately echo it's contents, and wraps it in an ul element.

Fixes #2757. See #2830.

File:

• trunk/src/includes/replies/functions.php (modified) (2 diffs)

trunk/src/includes/replies/functions.php

@@ -2539 +2539 @@
 function bbp_list_replies( $args = array() ) {
 
+    // Get bbPress
+    $bbp = bbpress();
+
     // Reset the reply depth
-    bbpress()->reply_query->reply_depth = 0;
+    $bbp->reply_query->reply_depth = 0;
 
     // In reply loop
-    bbpress()->reply_query->in_the_loop = true;
-
+    $bbp->reply_query->in_the_loop = true;
+
+    // Parse arguments
     $r = bbp_parse_args( $args, array(
-        'walker'       => null,
+        'walker'       => new BBP_Walker_Reply,
         'max_depth'    => bbp_thread_replies_depth(),
         'style'        => 'ul',
@@ -2556 +2560 @@
 
     // Get replies to loop through in $_replies
-    $walker = new BBP_Walker_Reply;
-    $walker->paged_walk( bbpress()->reply_query->posts, $r['max_depth'], $r['page'], $r['per_page'], $r );
-
-    bbpress()->max_num_pages            = $walker->max_pages;
-    bbpress()->reply_query->in_the_loop = false;
+    echo '<ul>' . $r['walker']->paged_walk( $bbp->reply_query->posts, $r['max_depth'], $r['page'], $r['per_page'], $r ) . '</ul>';
+
+    $bbp->max_num_pages            = $r['walker']->max_pages;
+    $bbp->reply_query->in_the_loop = false;
 }