Ticket #1918: widgets_inc_new_topics.diff

includes/core/widgets.php

@@ -750 +750 @@
        $show_date  = !empty( $instance['show_date'] ) ? 'on'                   : false;
        $show_user  = !empty( $instance['show_user'] ) ? 'on'                   : false;
        $post_types = !empty( $instance['post_type'] ) ? array( bbp_get_topic_post_type(), bbp_get_reply_post_type() ) : bbp_get_reply_post_type();
+       $inc_fresh_topics     = !empty( $instance['inc_fresh_topics']     ) ? $instance['inc_fresh_topics']        : false;
+
+       // Do we want to include fresh topics with no replies
+       switch ( $inc_fresh_topics ) {
+
+           // Include new topics with no replies with replies created most recently
+           case 'yes' :
+               $replies_query = array(
+                   'post_type'      => $post_types,
+                   'post_status'    => join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) ),
+                   'posts_per_page' => $max_shown,
+                   'meta_query'     => array( bbp_exclude_forum_ids( 'meta_query' ) )
+               );
+               break;
+
+           // Show replies created most recently
+           case 'no' :
+           default :
+               $replies_query = array(
+                   'post_type'      => $post_types,
+                   'post_status'    => join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) ),
+                   'posts_per_page' => $max_shown,
+                   'meta_query'     => array( bbp_exclude_forum_ids( 'meta_query' ) )
+               );      
+               break;
+       }
 
        // Note: private and hidden forums will be excluded via the
        // bbp_pre_get_posts_exclude_forums filter and function.
@@ -829 +855 @@
     * @param array $old_instance The old instance options
     */
    public function update( $new_instance, $old_instance ) {
-       $instance              = $old_instance;
-       $instance['title']     = strip_tags( $new_instance['title']     );
-       $instance['max_shown'] = strip_tags( $new_instance['max_shown'] );
-       $instance['show_date'] = strip_tags( $new_instance['show_date'] );
-       $instance['show_user'] = strip_tags( $new_instance['show_user'] );
+       $instance                     = $old_instance;
+       $instance['title']            = strip_tags( $new_instance['title']           );
+       $instance['max_shown']        = strip_tags( $new_instance['max_shown']       );
+       $instance['show_date']        = strip_tags( $new_instance['show_date']       );
+       $instance['show_user']        = strip_tags( $new_instance['show_user']       );
+       $instance['inc_fresh_topics'] = strip_tags( $new_instance['inc_fresh_topics']);
 
        return $instance;
    }
@@ -848 +875 @@
     * @uses BBP_Replies_Widget::get_field_name() To output the field name
     */
    public function form( $instance ) {
-       $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'] ) : '';
-       $show_user = !empty( $instance['show_user'] ) ? esc_attr( $instance['show_user'] ) : ''; ?>
+       $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']        ) : '';
+       $show_user        = !empty( $instance['show_user']        ) ? esc_attr( $instance['show_user']        ) : '';
+       $inc_fresh_topics = !empty( $instance['inc_fresh_topics'] ) ? esc_attr( $instance['inc_fresh_topics'] ) : ''; ?> ?>
 
        <p><label for="<?php echo $this->get_field_id( 'title'     ); ?>"><?php _e( 'Title:',                   'bbpress' ); ?> <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:', 'bbpress' ); ?> <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>
        <p><label for="<?php echo $this->get_field_id( 'show_date' ); ?>"><?php _e( 'Show post date:',          'bbpress' ); ?> <input type="checkbox" id="<?php echo $this->get_field_id( 'show_date' ); ?>" name="<?php echo $this->get_field_name( 'show_date' ); ?>" <?php checked( 'on', $show_date ); ?> /></label></p>
        <p><label for="<?php echo $this->get_field_id( 'show_user' ); ?>"><?php _e( 'Show reply author:',       'bbpress' ); ?> <input type="checkbox" id="<?php echo $this->get_field_id( 'show_user' ); ?>" name="<?php echo $this->get_field_name( 'show_user' ); ?>" <?php checked( 'on', $show_user ); ?> /></label></p>
+       <p>
+           <label for="<?php echo $this->get_field_id( 'inc_fresh_topics' ); ?>"><?php _e( 'Include fresh topics with no replies:',        'bbpress' ); ?></label>
+           <select name="<?php echo $this->get_field_name( 'inc_fresh_topics' ); ?>" id="<?php echo $this->get_field_name( 'inc_fresh_topics' ); ?>">
+               <option <?php selected( $inc_fresh_topics, 'no' );   ?> value="no"><?php _e( 'No',                'bbpress' ); ?></option>
+               <option <?php selected( $inc_fresh_topics, 'yes' );   ?> value="yes"><?php _e( 'Yes',               'bbpress' ); ?></option>
+               
+           </select>
+       </p>
 
        <?php
    }