Changeset 2773

Timestamp:

01/07/2011 10:56:38 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Do not show title or widget HTML if there is nothing to display.

File:

• branches/plugin/bbp-includes/bbp-widgets.php (modified) (7 diffs)

branches/plugin/bbp-includes/bbp-widgets.php

@@ -66 +66 @@
         );
 
-        echo $before_widget;
-        echo $before_title . $title . $after_title;
-
-        if ( bbp_has_forums( $default ) ) : ?>
+        if ( bbp_has_forums( $default ) ) :
+
+            echo $before_widget;
+            echo $before_title . $title . $after_title; ?>
 
             <ul>
@@ -81 +81 @@
             </ul>
 
-        <?php
-
-        endif;
-
-        echo $after_widget;
+        <?php echo $after_widget;
+
+        endif;      
     }
 
@@ -196 +194 @@
         );
 
-        echo $before_widget;
-        echo $before_title . $title . $after_title;
-
-        if ( $pop_check < $max_shown && bbp_has_topics( $default ) ) : ?>
+        if ( $pop_check < $max_shown && bbp_has_topics( $default ) ) :
+
+            echo $before_widget;
+            echo $before_title . $title . $after_title; ?>
 
             <ul>
@@ -212 +210 @@
             </ul>
 
-            <?php
+            <?php echo $after_widget;
 
         endif;
 
         if ( $pop_check >= $max_shown && bbp_has_topics( $default ) ) :
+
+            echo $before_widget;
+            echo $before_title . $title . $after_title;
 
             while ( bbp_topics() ) {
@@ -251 +252 @@
             </ul>
 
-            <?php
+            <?php echo $after_widget;
 
         endif;
 
-        echo $after_widget;
     }
 
@@ -368 +368 @@
         );
 
-        echo $before_widget;
-        echo $before_title . $title . $after_title;
-
-        if ( bbp_has_replies( $default ) ) : ?>
+        if ( bbp_has_replies( $default ) ) :
+
+            echo $before_widget;
+            echo $before_title . $title . $after_title; ?>
 
             <ul>
@@ -387 +387 @@
             </ul>
 
-            <?php
+            <?php echo $after_widget;
 
         endif;
-
-        echo $after_widget;
     }