Changeset 7638

Timestamp:

04/09/2008 08:09:45 PM (18 years ago)

Author:

ryan

Message:

Use wp_count_posts() to determine availabel statuses for get_available_post_statuses(). fixes #6654 for trunk

Location:

trunk

Files:

• wp-admin/includes/post.php (modified) (1 diff)
• wp-includes/post.php (modified) (2 diffs)

trunk/wp-admin/includes/post.php

@@ -507 +507 @@
 
 function get_available_post_statuses($type = 'post') {
-        global $wpdb;
-
-        $stati = $wpdb->get_col($wpdb->prepare("SELECT DISTINCT post_status FROM $wpdb->posts WHERE post_type = %s", $type));
-        return $stati;
+        $stati = wp_count_posts($type);
+
+        return array_keys(get_object_vars($stati));
 }
 

trunk/wp-includes/post.php

@@ -829 +829 @@
         $user = wp_get_current_user();
 
+        $cache_key = $type;
+        if ( !empty($perm) )
+                $cache_key .= '_' . $perm;
+
         $query = "SELECT post_status, COUNT( * ) AS num_posts FROM {$wpdb->posts} WHERE post_type = %s";
         if ( 'readable' == $perm && is_user_logged_in() ) {
-                if ( !current_user_can("read_private_{$type}s") )
+                if ( !current_user_can("read_private_{$type}s") ) {
+                        $cache_key .= '_' . $user->ID;
                         $query .= " AND (post_status != 'private' OR ( post_author = '$user->ID' AND post_status = 'private' ))";
+                }
         }
         $query .= ' GROUP BY post_status';
+
+        $count = wp_cache_get($cache_key, 'counts');
+        if ( false !== $count )
+                return $count;
+
         $count = $wpdb->get_results( $wpdb->prepare( $query, $type ), ARRAY_A );
 
@@ -842 +853 @@
         }
 
-        return (object) $stats;
-}
+        $stats = (object) $stats;
+        wp_cache_set($cache_key, $stats, 'counts');
+
+        return $stats;
+}
+
 
 /**