Changeset 6024

Timestamp:

05/10/2016 03:34:28 PM (9 years ago)

Author:

johnjamesjacoby

Message:

Forums: Updates to bbp_list_forums():

• Always run filter, even over empty output
• Only wrap output if not empty
• Ensure that $count related variables are accurately reset during each loop iteration
• Surrounding code clean-up

Fixes #2951.

File:

• trunk/src/includes/forums/template.php (modified) (4 diffs)

trunk/src/includes/forums/template.php

@@ -803 +803 @@
 
     // Define used variables
-    $output = $sub_forums = $topic_count = $reply_count = $counts = '';
-    $i = 0;
-    $count = array();
+    $output = '';
 
     // Parse arguments against default values
@@ -827 +825 @@
 
         // Total count (for separator)
+        $i          = 0;
         $total_subs = count( $sub_forums );
         foreach ( $sub_forums as $sub_forum ) {
@@ -833 +832 @@
             // Get forum details
             $count     = array();
-            $show_sep  = $total_subs > $i ? $r['separator'] : '';
             $permalink = bbp_get_forum_permalink( $sub_forum->ID );
             $title     = bbp_get_forum_title( $sub_forum->ID );
+            $show_sep  = ( $total_subs > $i )
+                ? $r['separator']
+                : '';
 
             // Show topic count
@@ -848 +849 @@
 
             // Counts to show
-            if ( ! empty( $count ) ) {
-                $counts = $r['count_before'] . implode( $r['count_sep'], $count ) . $r['count_after'];
-            }
+            $counts = ! empty( $count )
+                ? $r['count_before'] . implode( $r['count_sep'], $count ) . $r['count_after']
+                : '';
 
             // Build this sub forums link
             $output .= $r['link_before'] . '<a href="' . esc_url( $permalink ) . '" class="bbp-forum-link">' . $title . $counts . '</a>' . $show_sep . $r['link_after'];
         }
-
-        // Output the list
-        echo apply_filters( 'bbp_list_forums', $r['before'] . $output . $r['after'], $r, $args );
-    }
+    }
+
+    // Maybe wrap output
+    if ( ! empty( $output ) ) {
+        $output = $r['before'] . $output . $r['after'];
+    }
+
+    // Filter & output the forums list
+    echo apply_filters( 'bbp_list_forums', $output, $r, $args );
 }