Ticket #23498: 23498.6.diff

src/wp-includes/author-template.php

@@ -379 +379 @@
  * @link https://developer.wordpress.org/reference/functions/wp_list_authors/
  *
  * @since 1.2.0
+ * @since 5.3.0 The `$exclude_admin` parameter was updated to exclude all administrators.
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
@@ -391 +392 @@
  *     @type string       $order         Sorting direction for $orderby. Accepts 'ASC', 'DESC'. Default 'ASC'.
  *     @type int          $number        Maximum authors to return or display. Default empty (all authors).
  *     @type bool         $optioncount   Show the count in parenthesis next to the author's name. Default false.
- *     @type bool         $exclude_admin Whether to exclude the 'admin' account, if it exists. Default true.
+ *     @type bool         $exclude_admin Whether to exclude administrator accounts. Default true.
  *     @type bool         $show_fullname Whether to show the author's full name. Default false.
  *     @type bool         $hide_empty    Whether to hide any authors with no posts. Default true.
  *     @type string       $feed          If not empty, show a link to the author's feed and use this text as the alt
@@ -434 +435 @@
 
         $return = '';
 
-        $query_args           = wp_array_slice_assoc( $args, array( 'orderby', 'order', 'number', 'exclude', 'include' ) );
-        $query_args['fields'] = 'ids';
-        $authors              = get_users( $query_args );
+        $query_args = wp_array_slice_assoc( $args, array( 'orderby', 'order', 'number', 'exclude', 'include' ) );
 
+        $query_args['fields'] = 'ID';
+
+        if ( $args['exclude_admin'] ) { 
+                $query_args['exclude'] = get_users( array(
+                        'role'   => 'administrator',
+                        'fields' => 'ID',
+                ) ); 
+        }
+
+        $authors = get_users( $query_args );
+
         $author_count = array();
         foreach ( (array) $wpdb->get_results( "SELECT DISTINCT post_author, COUNT(ID) AS count FROM $wpdb->posts WHERE " . get_private_posts_cap_sql( 'post' ) . ' GROUP BY post_author' ) as $row ) {
                 $author_count[ $row->post_author ] = $row->count;
@@ -451 +461 @@
 
                 $author = get_userdata( $author_id );
 
-                if ( $args['exclude_admin'] && 'admin' === $author->display_name ) {
-                        continue;
-                }
-
                 if ( $args['show_fullname'] && $author->first_name && $author->last_name ) {
                         $name = "$author->first_name $author->last_name";
                 } else {

tests/phpunit/tests/user/listAuthors.php

@@ -51 +51 @@
                                 'last_name'    => 'norris',
                         )
                 );
+                self::$user_ids[] = $factory->user->create(
+                        array(
+                                'user_login'   => 'mary',
+                                'display_name' => 'mary',
+                                'role'         => 'administrator',
+                                'first_name'   => 'mary',
+                                'last_name'    => 'strong',
+                        )
+                );
                 self::$fred_id    = $factory->user->create(
                         array(
                                 'user_login' => 'fred',
@@ -135 +144 @@
                 );
         }
 
+        /**
+         * @ticket 23498
+         */
         function test_wp_list_authors_exclude_admin() {
                 self::factory()->post->create(
                         array(
@@ -146 +158 @@
                 $expected['exclude_admin'] =
                         '<li><a href="' . get_author_posts_url( 1 ) . '" title="Posts by admin">admin</a></li>' .
                         '<li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a></li>' .
+                        '<li><a href="' . self::$user_urls[3] . '" title="Posts by mary">mary</a></li>' .
                         '<li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a></li>' .
                         '<li><a href="' . self::$user_urls[0] . '" title="Posts by zack">zack</a></li>';