Changes in trunk/wp-includes/author-template.php [15148:17100]

File:

• trunk/wp-includes/author-template.php (modified) (8 diffs)

trunk/wp-includes/author-template.php

@@ -103 +103 @@
         $authordata = get_userdata( $user_id );
 
+    // Keys used as object vars cannot have dashes.
+    $field = str_replace('-', '', $field);
     $field = strtolower($field);
     $user_field = "user_$field";
@@ -212 +214 @@
 
 /**
- * Retrieve the URL to the author page of the author of the current post.
+ * Retrieve the URL to the author page for the user with the ID provided.
  *
  * @since 2.1.0
@@ -224 +226 @@
 
     if ( empty($link) ) {
-        $file = home_url() . '/';
+        $file = home_url( '/' );
         $link = $file . '?author=' . $auth_ID;
     } else {
@@ -233 +235 @@
         }
         $link = str_replace('%author%', $author_nicename, $link);
-        $link = home_url() . trailingslashit($link);
+        $link = home_url( user_trailingslashit( $link ) );
     }
 
@@ -258 +260 @@
  * <li>style (string) ('list'): Whether to display list of authors in list form
  * or as a string.</li>
- * <li>html (bool) (true): Whether to list the items in html for or plaintext.
+ * <li>html (bool) (true): Whether to list the items in html form or plaintext.
  * </li>
  * </ul>
@@ -271 +273 @@
 
     $defaults = array(
+        'orderby' => 'name', 'order' => 'ASC', 'number' => '',
         'optioncount' => false, 'exclude_admin' => true,
         'show_fullname' => false, 'hide_empty' => true,
@@ -277 +280 @@
     );
 
-    $r = wp_parse_args( $args, $defaults );
-    extract($r, EXTR_SKIP);
+    $args = wp_parse_args( $args, $defaults );
+    extract( $args, EXTR_SKIP );
+
     $return = '';
 
-    /** @todo Move select to get_authors(). */
-    $users = get_users_of_blog();
-    $author_ids = array();
-    foreach ( (array) $users as $user )
-        $author_ids[] = $user->user_id;
-    if ( count($author_ids) > 0  ) {
-        $author_ids = implode(',', $author_ids );
-        $authors = $wpdb->get_results( "SELECT ID, user_nicename from $wpdb->users WHERE ID IN($author_ids) " . ($exclude_admin ? "AND user_login <> 'admin' " : '') . "ORDER BY display_name" );
-    } else {
-        $authors = array();
-    }
+    $query_args = wp_array_slice_assoc( $args, array( 'orderby', 'order', 'number' ) );
+    $query_args['fields'] = 'ids';
+    $authors = get_users( $query_args );
 
     $author_count = array();
@@ -297 +293 @@
         $author_count[$row->post_author] = $row->count;
 
-    foreach ( (array) $authors as $author ) {
+    foreach ( $authors as $author_id ) {
+        $author = get_userdata( $author_id );
+
+        if ( $exclude_admin && 'admin' == $author->display_name )
+            continue;
+
+        $posts = isset( $author_count[$author->ID] ) ? $author_count[$author->ID] : 0;
+
+        if ( !$posts && $hide_empty )
+            continue;
 
         $link = '';
 
-        $author = get_userdata( $author->ID );
-        $posts = (isset($author_count[$author->ID])) ? $author_count[$author->ID] : 0;
-        $name = $author->display_name;
-
-        if ( $show_fullname && ($author->first_name != '' && $author->last_name != '') )
+        if ( $show_fullname && $author->first_name && $author->last_name )
             $name = "$author->first_name $author->last_name";
-
-        if( !$html ) {
-            if ( $posts == 0 ) {
-                if ( ! $hide_empty )
-                    $return .= $name . ', ';
-            } else
-                $return .= $name . ', ';
-
-            // No need to go further to process HTML.
-            continue;
+        else
+            $name = $author->display_name;
+
+        if ( !$html ) {
+            $return .= $name . ', ';
+
+            continue; // No need to go further to process HTML.
         }
 
-        if ( !($posts == 0 && $hide_empty) && 'list' == $style )
+        if ( 'list' == $style ) {
             $return .= '<li>';
-        if ( $posts == 0 ) {
-            if ( ! $hide_empty )
-                $link = $name;
-        } else {
-            $link = '<a href="' . get_author_posts_url($author->ID, $author->user_nicename) . '" title="' . esc_attr( sprintf(__("Posts by %s"), $author->display_name) ) . '">' . $name . '</a>';
-
-            if ( (! empty($feed_image)) || (! empty($feed)) ) {
-                $link .= ' ';
-                if (empty($feed_image))
-                    $link .= '(';
-                $link .= '<a href="' . get_author_feed_link($author->ID) . '"';
-
-                if ( !empty($feed) ) {
-                    $title = ' title="' . esc_attr($feed) . '"';
-                    $alt = ' alt="' . esc_attr($feed) . '"';
-                    $name = $feed;
-                    $link .= $title;
-                }
-
-                $link .= '>';
-
-                if ( !empty($feed_image) )
-                    $link .= "<img src=\"" . esc_url($feed_image) . "\" style=\"border: none;\"$alt$title" . ' />';
-                else
-                    $link .= $name;
-
-                $link .= '</a>';
-
-                if ( empty($feed_image) )
-                    $link .= ')';
+        }
+
+        $link = '<a href="' . get_author_posts_url( $author->ID, $author->user_nicename ) . '" title="' . esc_attr( sprintf(__("Posts by %s"), $author->display_name) ) . '">' . $name . '</a>';
+
+        if ( !empty( $feed_image ) || !empty( $feed ) ) {
+            $link .= ' ';
+            if ( empty( $feed_image ) ) {
+                $link .= '(';
             }
 
-            if ( $optioncount )
-                $link .= ' ('. $posts . ')';
-
+            $link .= '<a href="' . get_author_feed_link( $author->ID ) . '"';
+
+            $alt = $title = '';
+            if ( !empty( $feed ) ) {
+                $title = ' title="' . esc_attr( $feed ) . '"';
+                $alt = ' alt="' . esc_attr( $feed ) . '"';
+                $name = $feed;
+                $link .= $title;
+            }
+
+            $link .= '>';
+
+            if ( !empty( $feed_image ) )
+                $link .= '<img src="' . esc_url( $feed_image ) . '" style="border: none;"' . $alt . $title . ' />';
+            else
+                $link .= $name;
+
+            $link .= '</a>';
+
+            if ( empty( $feed_image ) )
+                $link .= ')';
         }
 
-        if ( $posts || ! $hide_empty )
-            $return .= $link . ( ( 'list' == $style ) ? '</li>' : ', ' );
+        if ( $optioncount )
+            $link .= ' ('. $posts . ')';
+
+        $return .= $link;
+        $return .= ( 'list' == $style ) ? '</li>' : ', ';
     }
 
-    $return = trim($return, ', ');
-
-    if ( ! $echo )
+    $return = rtrim($return, ', ');
+
+    if ( !$echo )
         return $return;
+
     echo $return;
 }