Changeset 3085 for branches/plugin/bbp-includes/bbp-widgets.php

Timestamp:

05/03/2011 08:01:48 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Revert most of r3054. $wp_query needs to be explicitly checked to guarantee we are not checking the $post global from a different internal loop.
Change from post_meta based _bbp_visibility to custom forum post status for private and hidden forums. This allows for easier exclusion without the need for slower meta queries. Add wp_reset_postdata() through-out loop and template files where the post global might have been altered by an external plugin. Add bbp_exclude_forum_ids() function, to explicitly exclude forums based on user capabilities.

File:

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

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

@@ -303 +303 @@
 
         $title        = apply_filters( 'bbp_forum_widget_title', $instance['title'] );
-        $parent_forum = !empty( $instance['parent_forum'] ) ? $instance['parent_forum'] : 0;
-
-        $default = array(
+        $parent_forum = !empty( $instance['parent_forum'] ) ? $instance['parent_forum'] : '0';
+
+        $forums_query = array(
             'post_parent'    => $parent_forum,
             'posts_per_page' => get_option( '_bbp_forums_per_page', 15 ),
@@ -312 +312 @@
         );
 
-        // Don't show private forums to normal users
-        if ( !current_user_can( 'read_private_forums' ) && empty( $default['meta_key'] ) && empty( $default['meta_value'] ) ) {
-            $default['meta_key']   = '_bbp_visibility';
-            $default['meta_value'] = 'public';
-        }
-
         bbp_set_query_name( 'bbp_widget' );
 
-        if ( bbp_has_forums( $default ) ) :
+        if ( bbp_has_forums( $forums_query ) ) :
 
             echo $before_widget;
@@ -455 +449 @@
         // Query defaults
         $topics_query = array(
+            'post_parent'    => $parent_forum,
             'post_author'    => 0,
             'posts_per_page' => $max_shown > $pop_check ? $max_shown : $pop_check,
+            'posts_per_page' => $max_shown,
             'show_stickies'  => false,
-            'posts_per_page' => $max_shown,
             'order'          => 'DESC',
         );
 
-        // Setup a meta_query to remove hidden forums
-        if ( ( empty( $parent_forum ) || ( 'any' == $parent_forum ) ) && ( $hidden = bbp_get_hidden_forum_ids() ) ) {
-
-            // Value and compare for meta_query
-            $value   = implode( ',', $hidden );
-            $compare = ( 1 < count( $hidden ) ) ? 'NOT IN' : '!=';
-
-            // Add meta_query to $replies_query
-            $topics_query['meta_query'] = array( array(
-                'key'     => '_bbp_forum_id',
-                'value'   => $value,
-                'compare' => $compare
-            ) );
-            $topics_query['post_parent'] = 'any';
-        }
-
         bbp_set_query_name( 'bbp_widget' );
+
+        // Remove any topics from hidden forums
+        $topics_query = bbp_exclude_forum_ids( $topics_query );
 
         if ( $pop_check < $max_shown && bbp_has_topics( $topics_query ) ) :
@@ -655 +637 @@
         );
 
-        // Setup a meta_query to remove hidden forums
-        if ( $hidden = bbp_get_hidden_forum_ids() ) {
-
-            // Value and compare for meta_query
-            $value   = implode( ',', $hidden );
-            $compare = ( 1 < count( $hidden ) ) ? 'NOT IN' : '!=';
-
-            // Add meta_query to $replies_query
-            $replies_query['meta_query'] = array( array(
-                'key'     => '_bbp_forum_id',
-                'value'   => $value,
-                'compare' => $compare
-            ) );
-        }
-
         // Set the query name
         bbp_set_query_name( 'bbp_widget' );
+
+        // Exclude hidden forums
+        $replies_query = bbp_exclude_forum_ids( $replies_query );
 
         // Get replies and display them