WordPress 4.7

[autoinstalls/wordpress.git] / wp-admin / includes / credits.php

diff --git a/wp-admin/includes/credits.php b/wp-admin/includes/credits.php
index c4fb2769bcbfb6ec46278037336a171ac235ba37..005858c384564e2c3642841f04b789946ce0c8ad 100644 (file)
--- a/wp-admin/includes/credits.php
+++ b/wp-admin/includes/credits.php
@@ -10,15 +10,13 @@
 /**
  * Retrieve the contributor credits.
  *
- * @global string $wp_version The current WordPress version.
- *
  * @since 3.2.0
  *
  * @return array|false A list of all of the contributors, or false on error.
-*/
+ */
 function wp_credits() {
-       global $wp_version;
-       $locale = get_locale();
+       $wp_version = get_bloginfo( 'version' );
+       $locale = get_user_locale();
 
        $results = get_site_transient( 'wordpress_credits_' . $locale );
 
@@ -26,7 +24,7 @@ function wp_credits() {
                || false !== strpos( $wp_version, '-' )
                || ( isset( $results['data']['version'] ) && strpos( $wp_version, $results['data']['version'] ) !== 0 )
        ) {
-               $response = wp_remote_get( "http://api.wordpress.org/core/credits/1.1/?version=$wp_version&locale=$locale" );
+               $response = wp_remote_get( "http://api.wordpress.org/core/credits/1.1/?version={$wp_version}&locale={$locale}" );
 
                if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
                        return false;
@@ -48,7 +46,7 @@ function wp_credits() {
  * @access private
  * @since 3.2.0
  *
- * @param string &$display_name The contributor's display name, passed by reference.
+ * @param string $display_name  The contributor's display name, passed by reference.
  * @param string $username      The contributor's username.
  * @param string $profiles      URL to the contributor's WordPress.org profile page.
  */
@@ -62,7 +60,7 @@ function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) {
  * @access private
  * @since 3.2.0
  *
- * @param string &$data External library data, passed by reference.
+ * @param string $data External library data, passed by reference.
  */
 function _wp_credits_build_object_link( &$data ) {
        $data = '<a href="' . esc_url( $data[1] ) . '">' . esc_html( $data[0] ) . '</a>';