Changeset 4673

Timestamp:

12/31/2012 02:26:17 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Rejig the post_status logic in bbp_has_topics() and bbp_has_replies() to use the 'perm' query variable when appropriate. This allows unfamiliar topic and reply statuses to work as intended. Also allows post authors to view their own private content. Fixes #2088.

Location:

trunk/includes

Files:

• replies/template-tags.php (modified) (3 diffs)
• topics/template-tags.php (modified) (3 diffs)

trunk/includes/replies/template-tags.php

@@ -69 +69 @@
     /** Defaults **************************************************************/
 
-    // What are the default allowed statuses (based on user caps)
-    if ( bbp_get_view_all( 'edit_others_replies' ) ) {
-        $post_statuses = array( bbp_get_public_status_id(), bbp_get_closed_status_id(), bbp_get_spam_status_id(), bbp_get_trash_status_id() );
-    } else {
-        $post_statuses = array( bbp_get_public_status_id(), bbp_get_closed_status_id() );
-    }
-
-    // Add support for private status
-    if ( current_user_can( 'read_private_replies' ) ) {
-        $post_statuses[] = bbp_get_private_status_id();
-    }
-
+    // Other defaults
     $default_reply_search = !empty( $_REQUEST['rs'] ) ? $_REQUEST['rs'] : false;
     $default_post_parent  = ( bbp_is_single_topic() ) ? bbp_get_topic_id() : 'any';
     $default_post_type    = ( bbp_is_single_topic() && bbp_show_lead_topic() ) ? bbp_get_reply_post_type() : array( bbp_get_topic_post_type(), bbp_get_reply_post_type() );
-    $default_post_status  = join( ',', $post_statuses );
 
     // Default query args
@@ -90 +78 @@
         'post_type'      => $default_post_type,         // Only replies
         'post_parent'    => $default_post_parent,       // Of this topic
-        'post_status'    => $default_post_status,       // Of this status
         'posts_per_page' => bbp_get_replies_per_page(), // This many
         'paged'          => bbp_get_paged(),            // On this page
@@ -97 +84 @@
         's'              => $default_reply_search,      // Maybe search
     );
+
+    // What are the default allowed statuses (based on user caps)
+    if ( bbp_get_view_all() ) {
+
+        // Default view=all statuses
+        $post_statuses = array(
+            bbp_get_public_status_id(),
+            bbp_get_closed_status_id(),
+            bbp_get_spam_status_id(),
+            bbp_get_trash_status_id()
+        );
+
+        // Add support for private status
+        if ( current_user_can( 'read_private_replies' ) ) {
+            $post_statuses[] = bbp_get_private_status_id();
+        }
+
+        // Join post statuses together
+        $default['post_status'] = join( ',', $post_statuses );
+
+    // Lean on the 'perm' query var value of 'readable' to provide statuses
+    } else {
+        $default['perm'] = 'readable';
+    }
 
     /** Setup *****************************************************************/

trunk/includes/topics/template-tags.php

@@ -87 +87 @@
     /** Defaults **************************************************************/
 
-    // What are the default allowed statuses (based on user caps)
-    if ( bbp_get_view_all() ) {
-        $post_statuses = array( bbp_get_public_status_id(), bbp_get_closed_status_id(), bbp_get_spam_status_id(), bbp_get_trash_status_id() );
-    } else {
-        $post_statuses = array( bbp_get_public_status_id(), bbp_get_closed_status_id() );
-    }
-
-    // Add support for private status
-    if ( current_user_can( 'read_private_topics' ) ) {
-        $post_statuses[] = bbp_get_private_status_id();
-    }
-
+    // Other defaults
     $default_topic_search  = !empty( $_REQUEST['ts'] ) ? $_REQUEST['ts'] : false;
     $default_show_stickies = (bool) ( bbp_is_single_forum() || bbp_is_topic_archive() ) && ( false === $default_topic_search );
     $default_post_parent   = bbp_is_single_forum() ? bbp_get_forum_id() : 'any';
-    $default_post_status   = join( ',', $post_statuses );
 
     // Default argument array
@@ -108 +96 @@
         'post_type'      => bbp_get_topic_post_type(), // Narrow query down to bbPress topics
         'post_parent'    => $default_post_parent,      // Forum ID
-        'post_status'    => $default_post_status,      // Post Status
         'meta_key'       => '_bbp_last_active_time',   // Make sure topic has some last activity time
         'orderby'        => 'meta_value',              // 'meta_value', 'author', 'date', 'title', 'modified', 'parent', rand',
@@ -118 +105 @@
         'max_num_pages'  => false,                     // Maximum number of pages to show
     );
+
+    // What are the default allowed statuses (based on user caps)
+    if ( bbp_get_view_all() ) {
+
+        // Default view=all statuses
+        $post_statuses = array(
+            bbp_get_public_status_id(),
+            bbp_get_closed_status_id(),
+            bbp_get_spam_status_id(),
+            bbp_get_trash_status_id()
+        );
+
+        // Add support for private status
+        if ( current_user_can( 'read_private_topics' ) ) {
+            $post_statuses[] = bbp_get_private_status_id();
+        }
+
+        // Join post statuses together
+        $default['post_status'] = join( ',', $post_statuses );
+
+    // Lean on the 'perm' query var value of 'readable' to provide statuses
+    } else {
+        $default['perm'] = 'readable';
+    }
 
     // Maybe query for topic tags