diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-06-21 16:41:02 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-06-21 16:41:02 +0000 |
| commit | a5fe68e002632c190ffbd85167671ed4d4961135 (patch) | |
| tree | ae57f94603111507c50cb3c212a03bedf8f7dc5a /wp-includes/author-template.php | |
| parent | 4e38776b5b68c61a4593a84340f4654200f7568e (diff) | |
WP Merge to WP 2.2.1
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1005 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/author-template.php')
| -rw-r--r-- | wp-includes/author-template.php | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php index 6006cf3..cc67faf 100644 --- a/wp-includes/author-template.php +++ b/wp-includes/author-template.php @@ -175,14 +175,15 @@ function get_author_name( $auth_id ) { function wp_list_authors($args = '') { global $wpdb; - $defaults = array( - 'optioncount' => false, 'exclude_admin' => true, - 'show_fullname' => false, 'hide_empty' => true, - 'feed' => '', 'feed_image' => '' - ); - - $r = wp_parse_args( $args, $defaults ); - extract($r); + if ( is_array($args) ) + $r = &$args; + else + parse_str($args, $r); + + $defaults = array('optioncount' => false, 'exclude_admin' => true, 'show_fullname' => false, 'hide_empty' => true, + 'feed' => '', 'feed_image' => ''); + $r = array_merge($defaults, $r); + extract($r, EXTR_SKIP); // TODO: Move select to get_authors(). $authors = $wpdb->get_results("SELECT ID, user_nicename from $wpdb->users " . ($exclude_admin ? "WHERE user_login <> 'admin' " : '') . "ORDER BY display_name"); |