X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/76aea3697c6043c1613370f172395b4f65ee71f0..1c09677af04c9e37714e09b73eb9dbc5b2e3eb13:/wp-includes/author-template.php diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php index c62b4bc0..51ff8a97 100644 --- a/wp-includes/author-template.php +++ b/wp-includes/author-template.php @@ -22,7 +22,7 @@ */ function get_the_author($deprecated = '') { global $authordata; - return apply_filters('the_author', $authordata->display_name); + return apply_filters('the_author', is_object($authordata) ? $authordata->display_name : null); } /** @@ -51,191 +51,72 @@ function the_author($deprecated = '', $deprecated_echo = true) { } /** - * Retrieve the description of the author of the current post. + * Retrieve the author who last edited the current post. * - * @since 1.5 - * @uses $authordata The current author's DB object. - * @return string The author's description. - */ -function get_the_author_description() { - global $authordata; - return $authordata->description; -} - -/** - * Display the description of the author of the current post. - * - * @link http://codex.wordpress.org/Template_Tags/the_author_description - * @since 1.0.0 - * @see get_the_author_description() - */ -function the_author_description() { - echo get_the_author_description(); -} - -/** - * Retrieve the login name of the author of the current post. - * - * @since 1.5 - * @uses $authordata The current author's DB object. - * @return string The author's login name (username). - */ -function get_the_author_login() { - global $authordata; - return $authordata->user_login; -} - -/** - * Display the login name of the author of the current post. - * - * @link http://codex.wordpress.org/Template_Tags/the_author_login - * @since 0.71 - * @see get_the_author_login() - */ -function the_author_login() { - echo get_the_author_login(); -} - -/** - * Retrieve the first name of the author of the current post. - * - * @since 1.5 - * @uses $authordata The current author's DB object. - * @return string The author's first name. - */ -function get_the_author_firstname() { - global $authordata; - return $authordata->first_name; -} - -/** - * Display the first name of the author of the current post. - * - * @link http://codex.wordpress.org/Template_Tags/the_author_firstname - * @since 0.71 - * @uses get_the_author_firstname() - */ -function the_author_firstname() { - echo get_the_author_firstname(); -} - -/** - * Retrieve the last name of the author of the current post. - * - * @since 1.5 - * @uses $authordata The current author's DB object. - * @return string The author's last name. - */ -function get_the_author_lastname() { - global $authordata; - return $authordata->last_name; -} - -/** - * Display the last name of the author of the current post. - * - * @link http://codex.wordpress.org/Template_Tags/the_author_lastname - * @since 0.71 - * @uses get_the_author_lastname() - */ -function the_author_lastname() { - echo get_the_author_lastname(); -} - -/** - * Retrieve the nickname of the author of the current post. - * - * @since 1.5 - * @uses $authordata The current author's DB object. - * @return string The author's nickname. - */ -function get_the_author_nickname() { - global $authordata; - return $authordata->nickname; -} - -/** - * Display the nickname of the author of the current post. - * - * @link http://codex.wordpress.org/Template_Tags/the_author_nickname - * @since 0.71 - * @uses get_the_author_nickname() - */ -function the_author_nickname() { - echo get_the_author_nickname(); -} - -/** - * Retrieve the ID of the author of the current post. - * - * @since 1.5 - * @uses $authordata The current author's DB object. - * @return int The author's ID. - */ -function get_the_author_ID() { - global $authordata; - return (int) $authordata->ID; -} - -/** - * Display the ID of the author of the current post. - * - * @link http://codex.wordpress.org/Template_Tags/the_author_ID - * @since 0.71 - * @uses get_the_author_ID() + * @since 2.8 + * @uses $post The current post's DB object. + * @uses get_post_meta() Retrieves the ID of the author who last edited the current post. + * @uses get_userdata() Retrieves the author's DB object. + * @uses apply_filters() Calls 'the_modified_author' hook on the author display name. + * @return string The author's display name. */ -function the_author_ID() { - echo get_the_author_id(); +function get_the_modified_author() { + global $post; + if ( $last_id = get_post_meta($post->ID, '_edit_last', true) ) { + $last_user = get_userdata($last_id); + return apply_filters('the_modified_author', $last_user->display_name); + } } /** - * Retrieve the email of the author of the current post. + * Display the name of the author who last edited the current post. * - * @since 1.5 - * @uses $authordata The current author's DB object. - * @return string The author's username. + * @since 2.8 + * @see get_the_author() + * @return string The author's display name, from get_the_modified_author(). */ -function get_the_author_email() { - global $authordata; - return $authordata->user_email; +function the_modified_author() { + echo get_the_modified_author(); } /** - * Display the email of the author of the current post. - * - * @link http://codex.wordpress.org/Template_Tags/the_author_email - * @since 0.71 - * @uses get_the_author_email() + * Retrieve the requested data of the author of the current post. + * @link http://codex.wordpress.org/Template_Tags/the_author_meta + * @since 2.8.0 + * @uses $authordata The current author's DB object (if $user_id not specified). + * @param string $field selects the field of the users record. + * @param int $user_id Optional. User ID. + * @return string The author's field from the current author's DB object. */ -function the_author_email() { - echo apply_filters('the_author_email', get_the_author_email() ); -} +function get_the_author_meta($field = '', $user_id = false) { + if ( ! $user_id ) + global $authordata; + else + $authordata = get_userdata( $user_id ); -/** - * Retrieve the URL to the home page of the author of the current post. - * - * @since 1.5 - * @uses $authordata The current author's DB object. - * @return string The URL to the author's page. - */ -function get_the_author_url() { - global $authordata; + $field = strtolower($field); + $user_field = "user_$field"; - if ( 'http://' == $authordata->user_url ) - return ''; + if ( 'id' == $field ) + $value = isset($authordata->ID) ? (int)$authordata->ID : 0; + elseif ( isset($authordata->$user_field) ) + $value = $authordata->$user_field; + else + $value = isset($authordata->$field) ? $authordata->$field : ''; - return $authordata->user_url; + return apply_filters('get_the_author_' . $field, $value, $user_id); } /** - * Display the URL to the home page of the author of the current post. - * - * @link http://codex.wordpress.org/Template_Tags/the_author_url - * @since 0.71 - * @uses get_the_author_url() + * Retrieve the requested data of the author of the current post. + * @link http://codex.wordpress.org/Template_Tags/the_author_meta + * @since 2.8.0 + * @param string $field selects the field of the users record. + * @param int $user_id Optional. User ID. + * @echo string The author's field from the current author's DB object. */ -function the_author_url() { - echo get_the_author_url(); +function the_author_meta($field = '', $user_id = false) { + echo apply_filters('the_author_' . $field, get_the_author_meta($field, $user_id), $user_id); } /** @@ -246,109 +127,17 @@ function the_author_url() { * * @link http://codex.wordpress.org/Template_Tags/the_author_link * @since 2.1 - * @uses get_the_author_url() + * @uses get_the_author_meta() * @uses the_author() */ function the_author_link() { - if (get_the_author_url()) { - echo '' . get_the_author() . ''; + if ( get_the_author_meta('url') ) { + echo '' . get_the_author() . ''; } else { the_author(); } } -/** - * Retrieve the ICQ number of the author of the current post. - * - * @since 1.5 - * @uses $authordata The current author's DB object. - * @return string The author's ICQ number. - */ -function get_the_author_icq() { - global $authordata; - return $authordata->icq; -} - -/** - * Display the ICQ number of the author of the current post. - * - * @link http://codex.wordpress.org/Template_Tags/the_author_icq - * @since 0.71 - * @see get_the_author_icq() - */ -function the_author_icq() { - echo get_the_author_icq(); -} - -/** - * Retrieve the AIM name of the author of the current post. - * - * @since 1.5 - * @uses $authordata The current author's DB object. - * @return string The author's AIM name. - */ -function get_the_author_aim() { - global $authordata; - return str_replace(' ', '+', $authordata->aim); -} - -/** - * Display the AIM name of the author of the current post. - * - * @link http://codex.wordpress.org/Template_Tags/the_author_aim - * @since 0.71 - * @see get_the_author_aim() - */ -function the_author_aim() { - echo get_the_author_aim(); -} - -/** - * Retrieve the Yahoo! IM name of the author of the current post. - * - * @since 1.5 - * @uses $authordata The current author's DB object. - * @return string The author's Yahoo! IM name. - */ -function get_the_author_yim() { - global $authordata; - return $authordata->yim; -} - -/** - * Display the Yahoo! IM name of the author of the current post. - * - * @link http://codex.wordpress.org/Template_Tags/the_author_yim - * @since 0.71 - * @see get_the_author_yim() - */ -function the_author_yim() { - echo get_the_author_yim(); -} - -/** - * Retrieve the MSN address of the author of the current post. - * - * @since 1.5 - * @uses $authordata The current author's DB object. - * @return string The author's MSN address. - */ -function get_the_author_msn() { - global $authordata; - return $authordata->msn; -} - -/** - * Display the MSN address of the author of the current post. - * - * @link http://codex.wordpress.org/Template_Tags/the_author_msn - * @since 0.71 - * @see get_the_author_msn() - */ -function the_author_msn() { - echo get_the_author_msn(); -} - /** * Retrieve the number of posts by the author of the current post. * @@ -381,7 +170,7 @@ function the_author_posts() { * link to the author's posts. * * @link http://codex.wordpress.org/Template_Tags/the_author_posts_link - * @since 1.2 + * @since 1.2.0 * @uses $authordata The current author's DB object. * @uses get_author_posts_url() * @uses get_the_author() @@ -389,18 +178,19 @@ function the_author_posts() { */ function the_author_posts_link($deprecated = '') { global $authordata; - printf( + $link = sprintf( '%3$s', get_author_posts_url( $authordata->ID, $authordata->user_nicename ), - sprintf( __( 'Posts by %s' ), attribute_escape( get_the_author() ) ), + esc_attr( sprintf( __( 'Posts by %s' ), get_the_author() ) ), get_the_author() ); + echo apply_filters( 'the_author_posts_link', $link ); } /** * Retrieve the URL to the author page of the author of the current post. * - * @since 2.1 + * @since 2.1.0 * @uses $wp_rewrite WP_Rewrite * @return string The URL to the author's page. */ @@ -427,33 +217,29 @@ function get_author_posts_url($author_id, $author_nicename = '') { return $link; } -/** - * Retrieve the specified author's preferred display name. - * - * @since 1.0.0 - * @param int $auth_id The ID of the author. - * @return string The author's display name. - */ -function get_author_name( $auth_id ) { - $authordata = get_userdata( $auth_id ); - return $authordata->display_name; -} - /** * List all the authors of the blog, with several options available. * - * optioncount (boolean) (false): Show the count in parenthesis next to the - * author's name. - * exclude_admin (boolean) (true): Exclude the 'admin' user that is installed by - * default. - * show_fullname (boolean) (false): Show their full names. - * hide_empty (boolean) (true): Don't show authors without any posts. - * feed (string) (''): If isn't empty, show links to author's feeds. - * feed_image (string) (''): If isn't empty, use this image to link to feeds. - * echo (boolean) (true): Set to false to return the output, instead of echoing. + * * * @link http://codex.wordpress.org/Template_Tags/wp_list_authors - * @since 1.2 + * @since 1.2.0 * @param array $args The argument array. * @return null|string The output, if echo is set to false. */ @@ -463,12 +249,12 @@ function wp_list_authors($args = '') { $defaults = array( 'optioncount' => false, 'exclude_admin' => true, 'show_fullname' => false, 'hide_empty' => true, - 'feed' => '', 'feed_image' => '', 'feed_type' => '', 'echo' => true + 'feed' => '', 'feed_image' => '', 'feed_type' => '', 'echo' => true, + 'style' => 'list', 'html' => true ); $r = wp_parse_args( $args, $defaults ); extract($r, EXTR_SKIP); - $return = ''; /** @todo Move select to get_authors(). */ @@ -480,6 +266,9 @@ function wp_list_authors($args = '') { } foreach ( (array) $authors as $author ) { + + $link = ''; + $author = get_userdata( $author->ID ); $posts = (isset($author_count[$author->ID])) ? $author_count[$author->ID] : 0; $name = $author->display_name; @@ -487,23 +276,34 @@ function wp_list_authors($args = '') { if ( $show_fullname && ($author->first_name != '' && $author->last_name != '') ) $name = "$author->first_name $author->last_name"; - if ( !($posts == 0 && $hide_empty) ) + if( !$html ) { + if ( $posts == 0 ) { + if ( ! $hide_empty ) + $return .= $name . ', '; + } else + $return .= $name . ', '; + + // No need to go further to process HTML. + continue; + } + + if ( !($posts == 0 && $hide_empty) && 'list' == $style ) $return .= '
  • '; if ( $posts == 0 ) { - if ( !$hide_empty ) + if ( ! $hide_empty ) $link = $name; } else { - $link = 'display_name)) . '">' . $name . ''; + $link = 'display_name) ) . '">' . $name . ''; if ( (! empty($feed_image)) || (! empty($feed)) ) { $link .= ' '; if (empty($feed_image)) $link .= '('; - $link .= 'ID) . '"'; if ( !empty($feed) ) { - $title = ' title="' . $feed . '"'; - $alt = ' alt="' . $feed . '"'; + $title = ' title="' . esc_attr($feed) . '"'; + $alt = ' alt="' . esc_attr($feed) . '"'; $name = $feed; $link .= $title; } @@ -511,7 +311,7 @@ function wp_list_authors($args = '') { $link .= '>'; if ( !empty($feed_image) ) - $link .= "'; + $link .= "'; else $link .= $name; @@ -526,10 +326,15 @@ function wp_list_authors($args = '') { } - if ( !($posts == 0 && $hide_empty) ) + if ( !($posts == 0 && $hide_empty) && 'list' == $style ) $return .= $link . '
    • '; + else if ( ! $hide_empty ) + $return .= $link . ', '; } - if ( !$echo ) + + $return = trim($return, ', '); + + if ( ! $echo ) return $return; echo $return; }