Changeset 2716

Timestamp:

12/11/2010 04:58:47 PM (16 years ago)

Author:

johnjamesjacoby

Message:

Fixes #1402 props GautamGupta

File:

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

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

@@ -39 +39 @@
         if ( bbp_has_forums( $default ) ) :
             echo "<ul>";
-            while ( bbp_forums ( ) ) : bbp_the_forum();
+            while ( bbp_forums() ) : bbp_the_forum();
 ?>
 
@@ -102 +102 @@
         echo $before_title . $title . $after_title;
 
-        if ( ($pop_check < $max_shown) && bbp_has_topics( $default ) ) :
-            echo "<ul>";
-            while ( bbp_topics ( ) ) : bbp_the_topic();
-?>
+        if ( $pop_check < $max_shown && bbp_has_topics( $default ) ) :
+            echo "<ul>";
+            while ( bbp_topics() ) : bbp_the_topic();
+?>
+
                 <li><a class="bbp-forum-title" href="<?php bbp_topic_permalink(); ?>" title="<?php bbp_topic_title(); ?>"><?php bbp_topic_title(); ?></a><?php if ( $show_date == 'on' )
                     _e( ', ' . bbp_get_topic_last_active() . ' ago' ); ?></li>
+
 <?php
             endwhile;
@@ -113 +115 @@
         endif;
 
-        if ( ($pop_check >= $max_shown) && bbp_has_topics( $default ) ) :
+        if ( $pop_check >= $max_shown && bbp_has_topics( $default ) ) :
             echo "<ul>";
             while ( bbp_topics ( ) ) : bbp_the_topic();
@@ -122 +124 @@
             foreach ( $topics as $topic_id => $topic_reply_count ) {
 ?>
+
                 <li><a class="bbp-forum-title" href="<?php bbp_topic_permalink( $topic_id ); ?>" title="<?php bbp_topic_title( $topic_id ); ?>"><?php bbp_topic_title( $topic_id ); ?></a><?php if ( $show_date == 'on' )
                     _e( ', ' . bbp_get_topic_last_active( $topic_id ) . ' ago' ); ?></li>
+
 <?php
                 $topic_count++;
@@ -145 +149 @@
 
     function form( $instance ) {
-        $title     = esc_attr( $instance['title'] );
-        $max_shown = esc_attr( $instance['max_shown'] );
-        $show_date = esc_attr( $instance['show_date'] );
-        $pop_check = esc_attr( $instance['pop_check'] );
-?>
+        $title     = !empty( $instance['title'] )     ? esc_attr( $instance['title'] )     : '';
+        $max_shown = !empty( $instance['max_shown'] ) ? esc_attr( $instance['max_shown'] ) : '';
+        $show_date = !empty( $instance['show_date'] ) ? esc_attr( $instance['show_date'] ) : '';
+        $pop_check = !empty( $instance['pop_check'] ) ? esc_attr( $instance['pop_check'] ) : '';
+?>
+
         <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" /></label></p>
         <p><label for="<?php echo $this->get_field_id( 'max_shown' ); ?>"><?php _e( 'Maximum topics to show:' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_shown' ); ?>" name="<?php echo $this->get_field_name( 'max_shown' ); ?>" type="text" value="<?php echo $max_shown; ?>" /></label></p>
@@ -192 +197 @@
             echo "<ul>";
 
-            while ( bbp_replies ( ) ) : bbp_the_reply();
-?>
+            while ( bbp_replies() ) : bbp_the_reply();
+?>
+
                 <li>
                     <a class="bbp-forum-title" href="<?php bbp_reply_permalink(); ?>" title="<?php bbp_reply_title(); ?>"><?php bbp_reply_title(); ?></a>
@@ -200 +206 @@
 
                 </li>
+
 <?php
             endwhile;
@@ -221 +228 @@
         $show_date = !empty( $instance['show_date'] ) ? esc_attr( $instance['show_date'] ) : '';
 ?>
+
         <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" /></label></p>
         <p><label for="<?php echo $this->get_field_id( 'max_shown' ); ?>"><?php _e( 'Maximum replies to show:' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_shown' ); ?>" name="<?php echo $this->get_field_name( 'max_shown' ); ?>" type="text" value="<?php echo $max_shown; ?>" /></label></p>
@@ -230 +238 @@
 }
 
-add_action( 'widgets_init', create_function( '', 'return register_widget("BBP_Forums_Widget");' ) );
-add_action( 'widgets_init', create_function( '', 'return register_widget("BBP_Topics_Widget");' ) );
+add_action( 'widgets_init', create_function( '', 'return register_widget("BBP_Forums_Widget");'  ) );
+add_action( 'widgets_init', create_function( '', 'return register_widget("BBP_Topics_Widget");'  ) );
 add_action( 'widgets_init', create_function( '', 'return register_widget("BBP_Replies_Widget");' ) );