Changeset 7268 for trunk/src/includes/search/template.php

Timestamp:

06/28/2024 10:02:43 PM (2 years ago)

Author:

johnjamesjacoby

Message:

Merge r7250 through r7267 from branches/2.6.

In trunk, for 2.7.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/includes/search/template.php (modified) (1 diff)

trunk/src/includes/search/template.php

@@ -47 +47 @@
         }
 
-        // What are the default allowed statuses (based on user caps)
-        if ( bbp_get_view_all() ) {
-
-                // Default view=all statuses
-                $post_statuses = array_keys( bbp_get_topic_statuses() );
-
-                // 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'] = $post_statuses;
-
-        // Lean on the 'perm' query var value of 'readable' to provide statuses
-        } else {
-                $default['perm'] = 'readable';
-        }
+        // Default public statuses (topics coincidentally cover all post types)
+        $post_statuses = array_keys( bbp_get_public_topic_statuses() );
+
+        // Add support for private status
+        if ( current_user_can( 'read_private_topics' ) ) {
+                $post_statuses[] = bbp_get_private_status_id();
+        }
+
+        // Add support for hidden status
+        if ( current_user_can( 'read_hidden_topics' ) ) {
+                $post_statuses[] = bbp_get_hidden_status_id();
+        }
+
+        // Join post statuses together
+        $default['post_status'] = $post_statuses;
 
         /** Setup *****************************************************************/