Changeset 7242

Timestamp:

03/07/2022 08:46:09 PM (3 years ago)

Author:

johnjamesjacoby

Message:

Replies: use correct wrapper element in bbp_list_replies().

This change ensures that the proper div/ol/ul wrapper is applied (via the style parameter argument) to the walked replies hierarchy, and avoids the potential for generating invalid HTML mark-up.

In branches/2.6, for 2.6.10.

Props mdjwel via GitHub pull request.

File:

• branches/2.6/src/includes/replies/functions.php (modified) (1 diff)

branches/2.6/src/includes/replies/functions.php

@@ -2409 +2409 @@
     ), 'list_replies' );
 
-    // Get replies to loop through in $_replies
-    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;
+    // Allowed styles (supported by BBP_Walker_Reply)
+    $allowed = array( 'div', 'ol', 'ul' );
+
+    // Get style
+    $style = in_array( $r['style'], $allowed, true )
+        ? $r['style']
+        : 'ul';
+
+    // Walk the replies
+    $walked_html = $r['walker']->paged_walk(
+        $bbp->reply_query->posts,
+        $r['max_depth'],
+        $r['page'],
+        $r['per_page'],
+        $r
+    );
+
+    // Override the "max_num_pages" setting
+    $bbp->max_num_pages = $r['walker']->max_pages;
+
+    // No longer in reply loop
     $bbp->reply_query->in_the_loop = false;
+
+    // Output the replies list
+    echo "<{$style} class='bbp-replies-list'>" . $walked_html . "</{$style}>";
 }