Ticket #15871: caps.15871.2.diff

wp-includes/user.php

@@ -377 +377 @@
                 if ( !empty( $query ) ) {
                         $this->query_vars = wp_parse_args( $query, array(
                                 'blog_id' => $GLOBALS['blog_id'],
+                                'capability' => '',
                                 'role' => '',
                                 'meta_key' => '',
                                 'meta_value' => '',
@@ -403 +404 @@
          * @access private
          */
         function prepare_query() {
-                global $wpdb;
+                global $wpdb, $wp_roles;
 
                 $qv = &$this->query_vars;
 
@@ -483 +484 @@
 
                 _parse_meta_query( $qv );
 
+                $capability = trim( $qv['capability'] );
                 $role = trim( $qv['role'] );
                 $blog_id = absint( $qv['blog_id'] );
 
-                if ( $blog_id && ( $role || is_multisite() ) ) {
-                        $cap_meta_query = array();
-                        $cap_meta_query['key'] = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
+                if ( $blog_id ) {
+                        if ( $capability ) {
+                                foreach ( $wp_roles->role_objects as $role => $role_obj ) {
+                                        if ( !$role_obj->has_cap( $capability ) ) {
+                                                $qv['meta_query'][] = array(
+                                                        'key' => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
+                                                        'value' => '"' . $role . '"',
+                                                        'compare' => 'NOT LIKE',
+                                                );
+                                        }
+                                }
+                        } elseif ( $role || is_multisite() ) {
+                                $cap_meta_query = array(
+                                        'key' => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities'
+                                );
 
-                        if ( $role ) {
-                                $cap_meta_query['value'] = '"' . $role . '"';
-                                $cap_meta_query['compare'] = 'like';
+                                if ( $role ) {
+                                        $cap_meta_query['value'] = '"' . $role . '"';
+                                        $cap_meta_query['compare'] = 'LIKE';
+                                }
+
+                                $qv['meta_query'][] = $cap_meta_query;
                         }
-
-                        $qv['meta_query'][] = $cap_meta_query;
                 }
 
                 if ( !empty( $qv['meta_query'] ) ) {
@@ -961 +976 @@
  * <li>id - Default is the value of the 'name' parameter. ID attribute of select element.</li>
  * <li>class - Class attribute of select element.</li>
  * <li>blog_id - ID of blog (Multisite only). Defaults to ID of current blog.</li>
+ * <li>users - Raw array of users.</li>
  * </ol>
  *
  * @since 2.3.0
@@ -970 +986 @@
  * @return string|null Null on display. String of HTML content on retrieve.
  */
 function wp_dropdown_users( $args = '' ) {
-        global $wpdb;
         $defaults = array(
                 'show_option_all' => '', 'show_option_none' => '',
                 'orderby' => 'display_name', 'order' => 'ASC',
                 'include' => '', 'exclude' => '', 'multi' => 0,
                 'show' => 'display_name', 'echo' => 1,
-                'selected' => 0, 'name' => 'user', 'class' => '', 'blog_id' => $GLOBALS['blog_id'],
-                'id' => '',
+                'selected' => 0, 'name' => 'user', 'class' => '', 'id' => '',
+                'blog_id' => $GLOBALS['blog_id'], 'users' => null
         );
 
         $defaults['selected'] = is_author() ? get_query_var( 'author' ) : 0;
@@ -985 +1000 @@
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
 
-        $query_args = wp_array_slice_assoc( $r, array( 'blog_id', 'include', 'exclude', 'orderby', 'order' ) );
-        $query_args['fields'] = array( 'ID', $show );
+        if ( is_null( $users ) ) {
+                $query_args = wp_array_slice_assoc( $r, array( 'blog_id', 'include', 'exclude', 'orderby', 'order' ) );
+                $query_args['fields'] = array( 'ID', $show );
+                $users = get_users( $query_args );
+        }
 
-        $users = get_users( $query_args );
-
         $output = '';
         if ( !empty($users) ) {
                 $name = esc_attr( $name );

wp-admin/includes/class-wp-posts-list-table.php

@@ -757 +757 @@
                                 <?php touch_time( 1, 1, 4, 1 ); ?>
                         </div>
                         <br class="clear" />
-
         <?php endif; // $bulk
 
                 if ( post_type_supports( $screen->post_type, 'author' ) ) :
                         $authors_dropdown = '';
 
                         if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) ) :
-                                $users_opt = array(
-                                        'name' => 'post_author',
-                                        'class'=> 'authors',
-                                        'multi' => 1,
-                                        'echo' => 0
-                                );
-                                if ( $bulk )
-                                        $users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
-                                $authors_dropdown  = '<label>';
-                                $authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
-                                $authors_dropdown .= wp_dropdown_users( $users_opt );
-                                $authors_dropdown .= '</label>';
+                                $users = _get_potential_authors();
+
+                                if ( count( $users ) > 1 ) :    
+                                        $users_opt = array(
+                                                'users' => $users,
+                                                'name' => 'post_author',
+                                                'class'=> 'authors',
+                                                'multi' => 1,
+                                                'echo' => 0
+                                        );
+                                        if ( $bulk )
+                                                $users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+                                        $authors_dropdown  = '<label>';
+                                        $authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
+                                        $authors_dropdown .= wp_dropdown_users( $users_opt );
+                                        $authors_dropdown .= '</label>';
+                                endif;
                         endif; // authors
         ?>
 

wp-admin/includes/meta-boxes.php

@@ -530 +530 @@
  */
 function post_author_meta_box($post) {
         global $user_ID;
-
 ?>
 <label class="screen-reader-text" for="post_author_override"><?php _e('Author'); ?></label>
 <?php
         wp_dropdown_users( array(
+                'users' => _get_potential_authors(),
                 'name' => 'post_author_override',
                 'selected' => empty($post->ID) ? $user_ID : $post->post_author
         ) );

wp-admin/includes/template.php

@@ -2171 +2171 @@
         return $button;
 }
 
+// Get list of users for the author metabox and quick edit dropdowns
+function _get_potential_authors() {
+        global $post_type;
+
+        $post_type_obj = get_post_type_object( $post_type );
+
+        return get_users( array(
+                'fields' => array( 'ID', 'display_name' ),
+                'capability' => $post_type_obj->cap->edit_posts,
+                'orderby' => 'display_name',
+                'order' => 'ASC'
+        ) );
+}
+