X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/67f24b02807a1ff7e9d1a97453ed84c404c0af0f..bf5c68485ef07868ad0a91168ecd0092af7661ae:/wp-includes/author-template.php?ds=inline
diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php
index 908e2335..4b21e446 100644
--- a/wp-includes/author-template.php
+++ b/wp-includes/author-template.php
@@ -22,7 +22,11 @@
*/
function get_the_author($deprecated = '') {
global $authordata;
- return apply_filters('the_author', $authordata->display_name);
+
+ 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();
@@ -94,6 +102,8 @@ function get_the_author_meta($field = '', $user_id = false) {
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";
@@ -104,7 +114,7 @@ function get_the_author_meta($field = '', $user_id = false) {
else
$value = isset($authordata->$field) ? $authordata->$field : '';
- return apply_filters('get_the_author_' . $field, $value);
+ return apply_filters('get_the_author_' . $field, $value, $user_id);
}
/**
@@ -116,7 +126,24 @@ function get_the_author_meta($field = '', $user_id = false) {
* @echo string The author's field from the current author's DB object.
*/
function the_author_meta($field = '', $user_id = false) {
- echo apply_filters('the_author_' . $field, get_the_author_meta($field, $user_id));
+ 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();
+ }
}
/**
@@ -127,15 +154,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 +165,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 +178,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,17 +199,23 @@ function the_author_posts() {
* @param string $deprecated Deprecated.
*/
function the_author_posts_link($deprecated = '') {
+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '2.1' );
+
global $authordata;
- printf(
- '%3$s',
+ if ( !is_object( $authordata ) )
+ return false;
+ $link = sprintf(
+ '%3$s',
get_author_posts_url( $authordata->ID, $authordata->user_nicename ),
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.
+ * Retrieve the URL to the author page for the user with the ID provided.
*
* @since 2.1.0
* @uses $wp_rewrite WP_Rewrite
@@ -199,7 +227,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 ) {
@@ -208,7 +236,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);
@@ -233,7 +261,7 @@ function get_author_posts_url($author_id, $author_nicename = '') {
* echoing.
*