Changeset 6317

Timestamp:

02/26/2017 08:15:20 AM (9 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.

Location:

trunk/src/includes

Files:

• common/classes.php (modified) (7 diffs)
• replies/functions.php (modified) (2 diffs)

trunk/src/includes/common/classes.php

@@ -326 +326 @@
                                 break;
                         case 'ol':
-                                echo "<ol class='bbp-threaded-replies'>\n";
+                                $output .= "<ol class='bbp-threaded-replies'>\n";
                                 break;
                         case 'ul':
                         default:
-                                echo "<ul class='bbp-threaded-replies'>\n";
+                                $output .= "<ul class='bbp-threaded-replies'>\n";
                                 break;
                 }
@@ -351 +351 @@
                                 break;
                         case 'ol':
-                                echo "</ol>\n";
+                                $output .= "</ol>\n";
                                 break;
                         case 'ul':
                         default:
-                                echo "</ul>\n";
+                                $output .= "</ul>\n";
                                 break;
                 }
@@ -401 +401 @@
                 // Check for a callback and use it if specified
                 if ( ! empty( $args['callback'] ) ) {
+                        ob_start();
                         call_user_func( $args['callback'], $object, $args, $depth );
+                        $output .= ob_get_clean();
                         return;
                 }
@@ -407 +409 @@
                 // Style for div or list element
                 if ( ! empty( $args['style'] ) && ( 'div' === $args['style'] ) ) {
-                        echo "<div>\n";
+                        $output .= "<div>\n";
                 } else {
-                        echo "<li>\n";
-                }
-
-                bbp_get_template_part( 'loop', 'single-reply' );
+                        $output .= "<li>\n";
+                }
+
+                $output .= bbp_buffer_template_part( 'loop', 'single-reply', false );
         }
 
@@ -422 +424 @@
                 // Check for a callback and use it if specified
                 if ( ! empty( $args['end-callback'] ) ) {
+                        ob_start();
                         call_user_func( $args['end-callback'], $object, $args, $depth );
+                        $output .= ob_get_clean();
                         return;
                 }
@@ -428 +432 @@
                 // Style for div or list element
                 if ( ! empty( $args['style'] ) && ( 'div' === $args['style'] ) ) {
-                        echo "</div>\n";
+                        $output .= "</div>\n";
                 } else {
-                        echo "</li>\n";
+                        $output .= "</li>\n";
                 }
         }
@@ -536 +540 @@
 
                 <option class="<?php echo esc_attr( $class ); ?>" value="<?php echo esc_attr( $value ); ?>"<?php selected( $args['selected'], $object->ID ); ?> <?php disabled( in_array( $reply_id, $ancestors ), true ); ?>><?php echo $pad . esc_html( $title ); ?></option>
-                
+
                 <?php
 

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;
 }