X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/3f5685912e89eb3b0534acd85aa0946b1ca2bbe3..refs/tags/wordpress-3.4.2:/wp-includes/author-template.php
diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php
index 51ff8a97..ab2737c5 100644
--- a/wp-includes/author-template.php
+++ b/wp-includes/author-template.php
@@ -22,6 +22,10 @@
*/
function get_the_author($deprecated = '') {
global $authordata;
+
+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '2.1' );
+
return apply_filters('the_author', is_object($authordata) ? $authordata->display_name : null);
}
@@ -34,17 +38,21 @@ 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()
* @link http://codex.wordpress.org/Template_Tags/the_author
*
* @param string $deprecated Deprecated.
- * @param string $deprecated_echo Echo the string or return it.
+ * @param string $deprecated_echo Deprecated. Use get_the_author(). Echo the string or return it.
* @return string The author's display name, from get_the_author().
*/
-function the_author($deprecated = '', $deprecated_echo = true) {
+function the_author( $deprecated = '', $deprecated_echo = true ) {
+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '2.1' );
+ if ( $deprecated_echo !== true )
+ _deprecated_argument( __FUNCTION__, '1.5', __('Use get_the_author()
instead if you do not want the value echoed.') );
if ( $deprecated_echo )
echo get_the_author();
return get_the_author();
@@ -88,23 +96,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 );
+ }
- $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 );
}
/**
@@ -119,6 +124,23 @@ function the_author_meta($field = '', $user_id = false) {
echo apply_filters('the_author_' . $field, get_the_author_meta($field, $user_id), $user_id);
}
+/**
+ * Retrieve either author's link or author's name.
+ *
+ * If the author has a home page set, return an HTML link, otherwise just return the
+ * author's name.
+ *
+ * @uses get_the_author_meta()
+ * @uses get_the_author()
+ */
+function get_the_author_link() {
+ if ( get_the_author_meta('url') ) {
+ return '' . get_the_author() . '';
+ } else {
+ return get_the_author();
+ }
+}
+
/**
* Display either author's link or author's name.
*
@@ -127,15 +149,10 @@ function the_author_meta($field = '', $user_id = false) {
*
* @link http://codex.wordpress.org/Template_Tags/the_author_link
* @since 2.1
- * @uses get_the_author_meta()
- * @uses the_author()
+ * @uses get_the_author_link()
*/
function the_author_link() {
- if ( get_the_author_meta('url') ) {
- echo '' . get_the_author() . '';
- } else {
- the_author();
- }
+ echo get_the_author_link();
}
/**
@@ -143,12 +160,12 @@ function the_author_link() {
*
* @since 1.5
* @uses $post The current post in the Loop's DB object.
- * @uses get_usernumposts()
+ * @uses count_user_posts()
* @return int The number of posts by the author.
*/
function get_the_author_posts() {
global $post;
- return get_usernumposts($post->post_author);
+ return count_user_posts($post->post_author);
}
/**
@@ -156,7 +173,7 @@ function get_the_author_posts() {
*
* @link http://codex.wordpress.org/Template_Tags/the_author_posts
* @since 0.71
- * @uses get_the_author_posts() Echos returned value from function.
+ * @uses get_the_author_posts() Echoes returned value from function.
*/
function the_author_posts() {
echo get_the_author_posts();
@@ -177,9 +194,14 @@ function the_author_posts() {
* @param string $deprecated Deprecated.
*/
function the_author_posts_link($deprecated = '') {
+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '2.1' );
+
global $authordata;
+ if ( !is_object( $authordata ) )
+ return false;
$link = sprintf(
- '%3$s',
+ '%3$s',
get_author_posts_url( $authordata->ID, $authordata->user_nicename ),
esc_attr( sprintf( __( 'Posts by %s' ), get_the_author() ) ),
get_the_author()
@@ -188,7 +210,7 @@ function the_author_posts_link($deprecated = '') {
}
/**
- * 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
* @uses $wp_rewrite WP_Rewrite
@@ -200,7 +222,7 @@ function get_author_posts_url($author_id, $author_nicename = '') {
$link = $wp_rewrite->get_author_permastruct();
if ( empty($link) ) {
- $file = get_option('home') . '/';
+ $file = home_url( '/' );
$link = $file . '?author=' . $auth_ID;
} else {
if ( '' == $author_nicename ) {
@@ -209,7 +231,7 @@ function get_author_posts_url($author_id, $author_nicename = '') {
$author_nicename = $user->user_nicename;
}
$link = str_replace('%author%', $author_nicename, $link);
- $link = get_option('home') . trailingslashit($link);
+ $link = home_url( user_trailingslashit( $link ) );
}
$link = apply_filters('author_link', $link, $author_id, $author_nicename);
@@ -234,7 +256,7 @@ function get_author_posts_url($author_id, $author_nicename = '') {
* echoing.
*