Changeset 3646

Timestamp:

12/08/2011 05:52:18 PM (14 years ago)

Author:

johnjamesjacoby

Message:

'suppress_filters' audit:

• Revert part of r3645
• Rename bbp_pre_get_posts() to bbp_parse_query() and hook to 'parse_query'
• Move forum post_type check out of bbp_pre_get_posts() and into bbp_pre_get_posts_exclude_forums() where it makes more sense
• Update documentation for above changes
• See #1698

Location:

branches/plugin/bbp-includes

Files:

• bbp-core-compatibility.php (modified) (5 diffs)
• bbp-core-hooks.php (modified) (1 diff)
• bbp-forum-functions.php (modified) (1 diff)

branches/plugin/bbp-includes/bbp-core-compatibility.php

@@ -1565 +1565 @@
 
 /**
- * Add checks for view page, user page, user edit, topic edit and reply edit
- * pages.
+ * Add checks for bbPress conditions to parse_query action
  *
  * If it's a user page, WP_Query::bbp_is_single_user is set to true.
@@ -1575 +1574 @@
  * displayed user's nicename are added.
  *
- * If it's a topic edit, WP_Query::bbp_is_topic_edit is set to true and
- * similarly, if it's a reply edit, WP_Query::bbp_is_reply_edit is set to true.
+ * If it's a forum edit, WP_Query::bbp_is_forum_edit is set to true
+ * If it's a topic edit, WP_Query::bbp_is_topic_edit is set to true
+ * If it's a reply edit, WP_Query::bbp_is_reply_edit is set to true.
  *
  * If it's a view page, WP_Query::bbp_is_view is set to true
@@ -1592 +1592 @@
  * @uses current_user_can() To check if the current user can edit the user
  * @uses apply_filters() Calls 'enable_edit_any_user_configuration' with true
- * @uses wp_die() To die
  * @uses bbp_is_query_name() Check if query name is 'bbp_widget'
  * @uses bbp_get_view_query_args() To get the view query args
@@ -1598 +1597 @@
  * @uses bbp_get_topic_post_type() To get the topic post type
  * @uses bbp_get_reply_post_type() To get the reply post type
- * @uses is_multisite() To check if it's a multisite
  * @uses remove_action() To remove the auto save post revision action
  */
-function bbp_pre_get_posts( $posts_query ) {
+function bbp_parse_query( $posts_query ) {
     global $bbp;
 
     // Bail if $posts_query is not the main loop
     if ( ! $posts_query->is_main_query() )
+        return;
+
+    // Bail if filters are suppressed on this query
+    if ( true == $posts_query->get( 'suppress_filters' ) )
         return;
 
@@ -1746 +1748 @@
         remove_action( 'pre_post_update', 'wp_save_post_revision' );
 
-    // Check forum status and exclude single forums the user cannot see
-    } elseif ( bbp_get_forum_post_type() == $posts_query->get( 'post_type' ) ) {
-
-        // Define local variable
-        $status = array();
-
-        // All users can see published forums
-        $status[] = bbp_get_public_status_id();
-
-        // Add bbp_get_private_status_id() if user is capable
-        if ( current_user_can( 'read_private_forums' ) ) {
-            $status[] = bbp_get_private_status_id();
-        }
-
-        // Add bbp_get_hidden_status_id() if user is capable
-        if ( current_user_can( 'read_hidden_forums' ) ) {
-            $status[] = bbp_get_hidden_status_id();
-        }
-
-        // Implode and add the statuses
-        $posts_query->set( 'post_status', implode( ',', $status ) );
-
     // Topic tag page
     } elseif ( bbp_is_topic_tag() ) {

branches/plugin/bbp-includes/bbp-core-hooks.php

@@ -125 +125 @@
 add_action( 'template_redirect', 'bbp_manage_topic_tag_handler', 1 );
 
-// Before and After the Query
-add_action( 'pre_get_posts',     'bbp_pre_get_posts',                2 );
-add_action( 'pre_get_posts',     'bbp_pre_get_posts_exclude_forums', 4 );
+// Parse the main query
+add_action( 'parse_query', 'bbp_parse_query', 2 );
+
+// Always exclude private/hidden forums if needed
+add_action( 'pre_get_posts', 'bbp_pre_get_posts_exclude_forums', 4 );
 
 // Restrict forum access

branches/plugin/bbp-includes/bbp-forum-functions.php

@@ -939 +939 @@
     switch ( $posts_query->get( 'post_type' ) ) {
 
+        // Forums
+        case bbp_get_forum_post_type() :
+
+            // Define local variable
+            $status = array();
+
+            // All users can see published forums
+            $status[] = bbp_get_public_status_id();
+
+            // Add bbp_get_private_status_id() if user is capable
+            if ( current_user_can( 'read_private_forums' ) ) {
+                $status[] = bbp_get_private_status_id();
+            }
+
+            // Add bbp_get_hidden_status_id() if user is capable
+            if ( current_user_can( 'read_hidden_forums' ) ) {
+                $status[] = bbp_get_hidden_status_id();
+            }
+
+            // Implode and add the statuses
+            $posts_query->set( 'post_status', implode( ',', $status ) );
+
+            break;
+
         // Topics
         case bbp_get_topic_post_type() :