Wordpress 3.6-scripts

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

diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php
index ab2737c563e3b3af267719e2a10e60aa8ab22457..2a89498968385f727269d4681395cb2b424bc794 100644 (file)
--- a/wp-includes/author-template.php
+++ b/wp-includes/author-template.php
@@ -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);
        }
@@ -135,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="author external">' . get_the_author() . '</a>';
+               return '<a href="' . esc_url( 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();
        }
@@ -164,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 );
 }
 
 /**
@@ -202,7 +200,7 @@ function the_author_posts_link($deprecated = '') {
                return false;
        $link = sprintf(
                '<a href="%1$s" title="%2$s" rel="author">%3$s</a>',
-               get_author_posts_url( $authordata->ID, $authordata->user_nicename ),
+               esc_url( get_author_posts_url( $authordata->ID, $authordata->user_nicename ) ),
                esc_attr( sprintf( __( 'Posts by %s' ), get_the_author() ) ),
                get_the_author()
        );
@@ -246,7 +244,7 @@ function get_author_posts_url($author_id, $author_nicename = '') {
  * <li>optioncount (boolean) (false): Show the count in parenthesis next to the
  * author's name.</li>
  * <li>exclude_admin (boolean) (true): Exclude the 'admin' user that is
- * installed bydefault.</li>
+ * installed by default.</li>
  * <li>show_fullname (boolean) (false): Show their full names.</li>
  * <li>hide_empty (boolean) (true): Don't show authors without any posts.</li>
  * <li>feed (string) (''): If isn't empty, show links to author's feeds.</li>
@@ -374,10 +372,10 @@ function wp_list_authors($args = '') {
 function is_multi_author() {
        global $wpdb;
 
-       if ( false === ( $is_multi_author = wp_cache_get('is_multi_author', 'posts') ) ) {
+       if ( false === ( $is_multi_author = get_transient( 'is_multi_author' ) ) ) {
                $rows = (array) $wpdb->get_col("SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 2");
                $is_multi_author = 1 < count( $rows ) ? 1 : 0;
-               wp_cache_set('is_multi_author', $is_multi_author, 'posts');
+               set_transient( 'is_multi_author', $is_multi_author );
        }
 
        return apply_filters( 'is_multi_author', (bool) $is_multi_author );
@@ -389,6 +387,6 @@ function is_multi_author() {
  * @private
  */
 function __clear_multi_author_cache() {
-       wp_cache_delete('is_multi_author', 'posts');
+       delete_transient( 'is_multi_author' );
 }
 add_action('transition_post_status', '__clear_multi_author_cache');