Wordpress 3.5

[autoinstalls/wordpress.git] / wp-includes / author-template.php

diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php
index f082fb24c4d173281506c09cac0eed8df7b5168d..1e65baa1e65b7ca40c09cd5587499a1b37486096 100644 (file)
--- a/wp-includes/author-template.php
+++ b/wp-includes/author-template.php
@@ -38,7 +38,7 @@ function get_the_author($deprecated = '') {
  * still use the old behavior will also pass the value from get_the_author().
  *
  * The normal, expected behavior of this function is to echo the author and not
- * return it. However, backwards compatiability has to be maintained.
+ * return it. However, backwards compatibility has to be maintained.
  *
  * @since 0.71
  * @see get_the_author()
@@ -69,8 +69,7 @@ function the_author( $deprecated = '', $deprecated_echo = true ) {
  * @return string The author's display name.
  */
 function get_the_modified_author() {
-       global $post;
-       if ( $last_id = get_post_meta($post->ID, '_edit_last', true) ) {
+       if ( $last_id = get_post_meta( get_post()->ID, '_edit_last', true) ) {
                $last_user = get_userdata($last_id);
                return apply_filters('the_modified_author', $last_user->display_name);
        }
@@ -96,25 +95,20 @@ function the_modified_author() {
  * @param int $user_id Optional. User ID.
  * @return string The author's field from the current author's DB object.
  */
-function get_the_author_meta($field = '', $user_id = false) {
-       if ( ! $user_id )
+function get_the_author_meta( $field = '', $user_id = false ) {
+       if ( ! $user_id ) {
                global $authordata;
-       else
+               $user_id = isset( $authordata->ID ) ? $authordata->ID : 0;
+       } else {
                $authordata = get_userdata( $user_id );
+       }
 
-       // Keys used as object vars cannot have dashes.
-       $field = str_replace('-', '', $field);
-       $field = strtolower($field);
-       $user_field = "user_$field";
+       if ( in_array( $field, array( 'login', 'pass', 'nicename', 'email', 'url', 'registered', 'activation_key', 'status' ) ) )
+               $field = 'user_' . $field;
 
-       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 : '';
+       $value = isset( $authordata->$field ) ? $authordata->$field : '';
 
-       return apply_filters('get_the_author_' . $field, $value, $user_id);
+       return apply_filters( 'get_the_author_' . $field, $value, $user_id );
 }
 
 /**
@@ -140,7 +134,7 @@ function the_author_meta($field = '', $user_id = false) {
  */
 function get_the_author_link() {
        if ( get_the_author_meta('url') ) {
-               return '<a href="' . get_the_author_meta('url') . '" title="' . esc_attr( sprintf(__("Visit %s&#8217;s website"), get_the_author()) ) . '" rel="external">' . get_the_author() . '</a>';
+               return '<a href="' . get_the_author_meta('url') . '" title="' . esc_attr( sprintf(__("Visit %s&#8217;s website"), get_the_author()) ) . '" rel="author external">' . get_the_author() . '</a>';
        } else {
                return get_the_author();
        }
@@ -169,8 +163,7 @@ function the_author_link() {
  * @return int The number of posts by the author.
  */
 function get_the_author_posts() {
-       global $post;
-       return count_user_posts($post->post_author);
+       return count_user_posts( get_post()->post_author );
 }
 
 /**
@@ -385,7 +378,7 @@ function is_multi_author() {
                wp_cache_set('is_multi_author', $is_multi_author, 'posts');
        }
 
-       return (bool) $is_multi_author;
+       return apply_filters( 'is_multi_author', (bool) $is_multi_author );
 }
 
 /**
@@ -397,5 +390,3 @@ function __clear_multi_author_cache() {
        wp_cache_delete('is_multi_author', 'posts');
 }
 add_action('transition_post_status', '__clear_multi_author_cache');
-
-?>