Changeset 5010

Timestamp:

07/10/2013 04:29:09 AM (11 years ago)

Author:

johnjamesjacoby

Message:

In bbp_get_dropdown(), remove the hard-coded post_status checker, and trust bbp_pre_get_posts_normalize_forum_visibility() to do its job. We still pass 'post_status' as null, so that get_posts() gets passed the results of bbp_parse_args(). Also, remove 'sort_column' array key from when this used get_pages(), and rely on 'orderby' for get_posts() instead.

In bbp_pre_get_posts_normalize_forum_visibility(), remove empties and duplicates from the $post_stati array.

Fixes #2354.

Location:

trunk/includes

Files:

• common/template-tags.php (modified) (4 diffs)
• forums/functions.php (modified) (1 diff)

trunk/includes/common/template-tags.php

@@ -1318 +1318 @@
      *               box, the first value would of course be selected -
      *               though you can have that as none (pass 'show_none' arg))
-     *  - sort_column: Sort by? Defaults to 'menu_order, post_title'
+     *  - orderby: Defaults to 'menu_order title'
      *  - post_parent: Post parent. Defaults to 0
      *  - post_status: Which all post_statuses to find in? Can be an array
@@ -1357 +1357 @@
         $r = bbp_parse_args( $args, array(
             'post_type'          => bbp_get_forum_post_type(),
+            'post_parent'        => null,
+            'post_status'        => null,
             'selected'           => 0,
-            'sort_column'        => 'menu_order',
             'exclude'            => array(),
-            'post_parent'        => null,
             'numberposts'        => -1,
-            'orderby'            => 'menu_order',
+            'orderby'            => 'menu_order title',
             'order'              => 'ASC',
             'walker'             => '',
@@ -1391 +1391 @@
         }
 
-        /** Post Status *******************************************************/
-
-        // Define local variable(s)
-        $post_stati = array();
-
-        // Public
-        $post_stati[] = bbp_get_public_status_id();
-
-        // Forums
-        if ( bbp_get_forum_post_type() === $r['post_type'] ) {
-
-            // Private forums
-            if ( current_user_can( 'read_private_forums' ) ) {
-                $post_stati[] = bbp_get_private_status_id();
-            }
-
-            // Hidden forums
-            if ( current_user_can( 'read_hidden_forums' ) ) {
-                $post_stati[] = bbp_get_hidden_status_id();
-            }
-        }
-
-        // Setup the post statuses
-        $r['post_status'] = implode( ',', $post_stati );
-
         /** Setup variables ***************************************************/
 
@@ -1422 +1397 @@
             'post_type'          => $r['post_type'],
             'post_status'        => $r['post_status'],
-            'sort_column'        => $r['sort_column'],
             'exclude'            => $r['exclude'],
             'post_parent'        => $r['post_parent'],

trunk/includes/forums/functions.php

@@ -1695 +1695 @@
 
         // Add the statuses
-        $posts_query->set( 'post_status', $post_stati );
+        $posts_query->set( 'post_status', array_unique( array_filter( $post_stati ) ) );
     }