Changeset 13052

Timestamp:

02/10/2010 10:36:50 PM (15 years ago)

Author:

ryan

Message:

Consult exclude_from_search when retrieving post_status = any. see #9674

Location:

trunk/wp-includes

Files:

• post.php (modified) (2 diffs)
• query.php (modified) (2 diffs)

trunk/wp-includes/post.php

@@ -87 +87 @@
     register_post_status( 'trash', array(   'label' => _x('Trash', 'post'),
                                             'public' => true,
+                                            'exclude_from_search' => true,
                                             '_builtin' => true,
                                             'label_count' => _n_noop('Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>')
@@ -93 +94 @@
     register_post_status( 'auto-draft', array(  'label' => _x('Auto-Draft', 'post'),
                                             'public' => false,
+                                            'exclude_from_search' => true,
                                             '_builtin' => true,
                                             'label_count' => _n_noop('Auto-Draft <span class="count">(%s)</span>', 'Auto-Drafts <span class="count">(%s)</span>')

trunk/wp-includes/query.php

@@ -2098 +2098 @@
             $r_status = array();
             $p_status = array();
+            $e_status = array();
             if ( $q['post_status'] == 'any' ) {
-                // @todo Use register_post_status() data to determine which states should be excluded.
-                $r_status[] = "$wpdb->posts.post_status <> 'trash'";
+                foreach ( get_post_stati( array('exclude_from_search' => true) ) as $status )
+                    $e_status[] = "$wpdb->posts.post_status <> '$status'";
             } else {
                 foreach ( get_post_stati() as $status ) {
@@ -2117 +2118 @@
             }
 
+            if ( !empty($e_status) ) {
+                $statuswheres[] = "(" . join( ' AND ', $e_status ) . ")";
+            }
             if ( !empty($r_status) ) {
                 if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can("edit_others_{$post_type_cap}s") )