Changeset 17088

Timestamp:

12/20/2010 05:25:39 PM (14 years ago)

Author:

ryan

Message:

Add 'who' arg to wp_dropdown_users() and get_users(). Add' hide_if_only_one_author' argument to get_users(). Query only authors (user level greater than 0) when who => author is passed. Query only authors for author meta box and quick edit dropdowns. Props scribu. fixes #15871

Location:

trunk

Files:

• wp-admin/includes/class-wp-posts-list-table.php (modified) (3 diffs)
• wp-admin/includes/meta-boxes.php (modified) (1 diff)
• wp-includes/meta.php (modified) (1 diff)
• wp-includes/user.php (modified) (5 diffs)

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

@@ -758 +758 @@
             </div>
             <br class="clear" />
-
     <?php endif; // $bulk
 
@@ -766 +765 @@
             if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) ) :
                 $users_opt = array(
+                    'hide_if_only_one_author' => true,
+                    'who' => 'authors',
                     'name' => 'post_author',
                     'class'=> 'authors',
@@ -773 +774 @@
                 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>';
+
+                if ( $authors = wp_dropdown_users( $users_opt ) ) :
+                    $authors_dropdown  = '<label>';
+                    $authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
+                    $authors_dropdown .= $authors;
+                    $authors_dropdown .= '</label>';
+                endif;
             endif; // authors
     ?>

trunk/wp-admin/includes/meta-boxes.php

@@ -531 +531 @@
 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(
+        'who' => 'authors',
         'name' => 'post_author_override',
         'selected' => empty($post->ID) ? $user_ID : $post->post_author

trunk/wp-includes/meta.php

@@ -434 +434 @@
             $meta_compare_string = '%s';
         }
+
+        // @todo Temporary hack to support empty values. Do not use outside of core.
+        if ( '_wp_zero_value' == $meta_value )
+            $meta_value = 0;
+
         $where .= $wpdb->prepare( " AND CAST($alias.meta_value AS {$meta_type}) {$meta_compare} {$meta_compare_string}", $meta_value );
     }

trunk/wp-includes/user.php

@@ -482 +482 @@
         }
 
+        $blog_id = absint( $qv['blog_id'] );
+
+        if ( 'authors' == $qv['who'] && $blog_id ) {
+            $qv['meta_key'] = $wpdb->get_blog_prefix( $blog_id ) . 'user_level';
+            $qv['meta_value'] = '_wp_zero_value'; // Hack to pass '0'
+            $qv['meta_compare'] = '!=';
+            $qv['blog_id'] = $blog_id = 0; // Prevent extra meta query
+        }
+
         _parse_meta_query( $qv );
 
         $role = trim( $qv['role'] );
-        $blog_id = absint( $qv['blog_id'] );
 
         if ( $blog_id && ( $role || is_multisite() ) ) {
@@ -930 +938 @@
  * <li>show_option_all - Text to show all and whether HTML option exists.</li>
  * <li>show_option_none - Text for show none and whether HTML option exists.</li>
+ * <li>hide_if_only_one_author - Don't create the dropdown if there is only one user.</li>
  * <li>orderby - SQL order by clause for what order the users appear. Default is 'display_name'.</li>
  * <li>order - Default is 'ASC'. Can also be 'DESC'.</li>
@@ -942 +951 @@
  * <li>class - Class attribute of select element.</li>
  * <li>blog_id - ID of blog (Multisite only). Defaults to ID of current blog.</li>
+ * <li>who - Which users to query.  Currently only 'authors' is supported. Default is all users.</li>
  * </ol>
  *
@@ -951 +961 @@
  */
 function wp_dropdown_users( $args = '' ) {
-    global $wpdb;
     $defaults = array(
-        'show_option_all' => '', 'show_option_none' => '',
+        'show_option_all' => '', 'show_option_none' => '', 'hide_if_only_one_author' => '',
         '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'], 'who' => ''
     );
 
@@ -966 +975 @@
     extract( $r, EXTR_SKIP );
 
-    $query_args = wp_array_slice_assoc( $r, array( 'blog_id', 'include', 'exclude', 'orderby', 'order' ) );
+    $query_args = wp_array_slice_assoc( $r, array( 'blog_id', 'include', 'exclude', 'orderby', 'order', 'who' ) );
     $query_args['fields'] = array( 'ID', $show );
-
     $users = get_users( $query_args );
 
     $output = '';
-    if ( !empty($users) ) {
+    if ( !empty($users) && ( empty($hide_if_only_one_author) || count($users) > 1 ) ) {
         $name = esc_attr( $name );
         if ( $multi && ! $id )