Changeset 12303

Timestamp:

12/01/2009 08:14:42 AM (16 years ago)

Author:

azaozz

Message:

Don't show deleted Pages in wp.getPages results, props ryan, props Denis-de-Bernardy,fixes #11243

Location:

trunk

Files:

• wp-includes/query.php (modified) (1 diff)
• xmlrpc.php (modified) (1 diff)

trunk/wp-includes/query.php

@@ -2109 +2109 @@
             $r_status = array();
             $p_status = array();
-            if ( in_array( 'draft'  , $q_status ) )
-                $r_status[] = "$wpdb->posts.post_status = 'draft'";
-            if ( in_array( 'pending', $q_status ) )
-                $r_status[] = "$wpdb->posts.post_status = 'pending'";
-            if ( in_array( 'future' , $q_status ) )
-                $r_status[] = "$wpdb->posts.post_status = 'future'";
-            if ( in_array( 'inherit' , $q_status ) )
-                $r_status[] = "$wpdb->posts.post_status = 'inherit'";
-            if ( in_array( 'private', $q_status ) )
-                $p_status[] = "$wpdb->posts.post_status = 'private'";
-            if ( in_array( 'publish', $q_status ) )
-                $r_status[] = "$wpdb->posts.post_status = 'publish'";
-            if ( in_array( 'trash', $q_status ) )
-                $r_status[] = "$wpdb->posts.post_status = 'trash'";
+            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'";
+            } else {
+                if ( in_array( 'draft'  , $q_status ) )
+                    $r_status[] = "$wpdb->posts.post_status = 'draft'";
+                if ( in_array( 'pending', $q_status ) )
+                    $r_status[] = "$wpdb->posts.post_status = 'pending'";
+                if ( in_array( 'future' , $q_status ) )
+                    $r_status[] = "$wpdb->posts.post_status = 'future'";
+                if ( in_array( 'inherit' , $q_status ) )
+                    $r_status[] = "$wpdb->posts.post_status = 'inherit'";
+                if ( in_array( 'private', $q_status ) )
+                    $p_status[] = "$wpdb->posts.post_status = 'private'";
+                if ( in_array( 'publish', $q_status ) )
+                    $r_status[] = "$wpdb->posts.post_status = 'publish'";
+                if ( in_array( 'trash', $q_status ) )
+                    $r_status[] = "$wpdb->posts.post_status = 'trash'";
+            }
 
             if ( empty($q['perm'] ) || 'readable' != $q['perm'] ) {

trunk/xmlrpc.php

@@ -613 +613 @@
         do_action('xmlrpc_call', 'wp.getPages');
 
-        $pages = get_posts( array('post_type' => 'page', 'post_status' => 'all', 'numberposts' => $num_pages) );
+        $pages = get_posts( array('post_type' => 'page', 'post_status' => 'any', 'numberposts' => $num_pages) );
         $num_pages = count($pages);