WordPress 3.9.1

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

diff --git a/wp-admin/credits.php b/wp-admin/credits.php
index cdc84c7c6989a621a407c4c21012bd0c00441593..87ebc8659d7d0085adb0036d9de071fb43b12d8a 100644 (file)
--- a/wp-admin/credits.php
+++ b/wp-admin/credits.php
@@ -7,50 +7,82 @@
  */
 
 /** WordPress Administration Bootstrap */
  */
 
 /** WordPress Administration Bootstrap */

-require_once( './admin.php' );
+require_once( dirname( __FILE__ ) . '/admin.php' );

 
 $title = __( 'Credits' );
 
 
 $title = __( 'Credits' );
 

+/**
+ * Retrieve the contributor credits.
+ *
+ * @global string $wp_version The current WordPress version.
+ *
+ * @since 3.2.0
+ *
+ * @return array|bool A list of all of the contributors, or false on error.
+*/

 function wp_credits() {
        global $wp_version;
        $locale = get_locale();
 
        $results = get_site_transient( 'wordpress_credits_' . $locale );
 
 function wp_credits() {
        global $wp_version;
        $locale = get_locale();
 
        $results = get_site_transient( 'wordpress_credits_' . $locale );
 

-       if ( ! is_array( $results ) ) {
-               $response = wp_remote_get( "http://api.wordpress.org/core/credits/1.0/?version=$wp_version&locale=$locale" );
+       if ( ! is_array( $results )
+               || 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" );

 
                if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
                        return false;
 
 
                if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
                        return false;
 

-               $results = maybe_unserialize( wp_remote_retrieve_body( $response ) );
+               $results = json_decode( wp_remote_retrieve_body( $response ), true );

 
                if ( ! is_array( $results ) )
                        return false;
 
 
                if ( ! is_array( $results ) )
                        return false;
 

-               set_site_transient( 'wordpress_credits_' . $locale, $results, 86400 ); // One day
+               set_site_transient( 'wordpress_credits_' . $locale, $results, DAY_IN_SECONDS );

        }
 
        return $results;
 }
 
        }
 
        return $results;
 }
 

+/**
+ * Retrieve the link to a contributor's WordPress.org profile page.
+ *
+ * @access private
+ * @since 3.2.0
+ *
+ * @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.
+ * @return string A contributor's display name, hyperlinked to a WordPress.org profile page.
+ */

 function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) {
        $display_name = '<a href="' . esc_url( sprintf( $profiles, $username ) ) . '">' . esc_html( $display_name ) . '</a>';
 }
 
 function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) {
        $display_name = '<a href="' . esc_url( sprintf( $profiles, $username ) ) . '">' . esc_html( $display_name ) . '</a>';
 }
 

+/**
+ * Retrieve the link to an external library used in WordPress.
+ *
+ * @access private
+ * @since 3.2.0
+ *
+ * @param string &$data External library data, passed by reference.
+ * @return string Link to the external library.
+ */

 function _wp_credits_build_object_link( &$data ) {
        $data = '<a href="' . esc_url( $data[1] ) . '">' . $data[0] . '</a>';
 }
 
 list( $display_version ) = explode( '-', $wp_version );
 
 function _wp_credits_build_object_link( &$data ) {
        $data = '<a href="' . esc_url( $data[1] ) . '">' . $data[0] . '</a>';
 }
 
 list( $display_version ) = explode( '-', $wp_version );
 

-include( './admin-header.php' );
+include( ABSPATH . 'wp-admin/admin-header.php' );

 ?>
 <div class="wrap about-wrap">
 
 <h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
 
 ?>
 <div class="wrap about-wrap">
 
 <h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
 

-<div class="about-text"><?php printf( __( 'Thank you for updating to the latest version! Using WordPress %s will improve your looks, personality, and web publishing experience. Okay, just the last one, but still. :)' ), $display_version ); ?></div>
+<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s has lots of refinements we think you&#8217;ll love.' ), $display_version ); ?></div>

 
 <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
 
 
 <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
 


@@ -70,10 +102,10 @@ $credits = wp_credits();
 
 if ( ! $credits ) {
        echo '<p class="about-description">' . sprintf( __( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
 
 if ( ! $credits ) {
        echo '<p class="about-description">' . sprintf( __( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),

-               'http://wordpress.org/about/',
+               'https://wordpress.org/about/',

                /* translators: Url to the codex documentation on contributing to WordPress used on the credits page */
                __( 'http://codex.wordpress.org/Contributing_to_WordPress' ) ) . '</p>';
                /* translators: Url to the codex documentation on contributing to WordPress used on the credits page */
                __( 'http://codex.wordpress.org/Contributing_to_WordPress' ) ) . '</p>';

-       include( './admin-footer.php' );
+       include( ABSPATH . 'wp-admin/admin-footer.php' );

        exit;
 }
 
        exit;
 }
 


@@ -128,13 +160,13 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) {
 
 ?>
 <p class="clear"><?php printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
 
 ?>
 <p class="clear"><?php printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),

-       /* translators: Url to the codex documentation on contributing to WordPress used on the credits page */
-       __( 'http://codex.wordpress.org/Contributing_to_WordPress' ) ); ?></p>
+       /* translators: URL to the Make WordPress 'Get Involved' landing page used on the credits page */
+       __( 'https://make.wordpress.org/' ) ); ?></p>

 
 </div>
 <?php
 
 
 </div>
 <?php
 

-include( './admin-footer.php' );
+include( ABSPATH . 'wp-admin/admin-footer.php' );

 
 return;
 
 
 return;
 


@@ -157,5 +189,3 @@ __( 'XML-RPC' );
 __( 'Internationalization' );
 __( 'External Libraries' );
 __( 'Icon Design' );
 __( 'Internationalization' );
 __( 'External Libraries' );
 __( 'Icon Design' );

-
-?>