WordPress 4.3-scripts

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

diff --git a/wp-admin/credits.php b/wp-admin/credits.php
index 4e160f4eb2f952190fb86ff2e7c045f37e0c4825..33ae70813f1d65ac437055487bacba68e4dff6aa 100644 (file)
--- a/wp-admin/credits.php
+++ b/wp-admin/credits.php
@@ -18,7 +18,7 @@ $title = __( 'Credits' );
  *
  * @since 3.2.0
  *
- * @return array|bool A list of all of the contributors, or false on error.
+ * @return array|false A list of all of the contributors, or false on error.
 */
 function wp_credits() {
        global $wp_version;
@@ -55,7 +55,6 @@ function wp_credits() {
  * @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>';
@@ -68,10 +67,9 @@ function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) {
  * @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>';
+       $data = '<a href="' . esc_url( $data[1] ) . '">' . esc_html( $data[0] ) . '</a>';
 }
 
 list( $display_version ) = explode( '-', $wp_version );
@@ -82,7 +80,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 <h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
 
-<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s helps you communicate and share, globally.' ), $display_version ); ?></div>
+<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s makes it even easier to format your content and customize your site.' ), $display_version ); ?></div>
 
 <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
 
@@ -111,8 +109,6 @@ if ( ! $credits ) {
 
 echo '<p class="about-description">' . __( 'WordPress is created by a worldwide team of passionate individuals.' ) . "</p>\n";
 
-$gravatar = is_ssl() ? 'https://secure.gravatar.com/avatar/' : 'http://0.gravatar.com/avatar/';
-
 foreach ( $credits['groups'] as $group_slug => $group_data ) {
        if ( $group_data['name'] ) {
                if ( 'Translators' == $group_data['name'] ) {
@@ -124,7 +120,7 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) {
                        $title = translate( $group_data['name'] );
                }
 
-               echo '<h4 class="wp-people-group">' . $title . "</h4>\n";
+               echo '<h4 class="wp-people-group">' . esc_html( $title ) . "</h4>\n";
        }
 
        if ( ! empty( $group_data['shuffle'] ) )
@@ -144,11 +140,14 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) {
                        $classes = 'wp-people-group ' . ( $compact ? 'compact' : '' );
                        echo '<ul class="' . $classes . '" id="wp-people-group-' . $group_slug . '">' . "\n";
                        foreach ( $group_data['data'] as $person_data ) {
-                               echo '<li class="wp-person" id="wp-person-' . $person_data[2] . '">' . "\n\t";
-                               echo '<a href="' . sprintf( $credits['data']['profiles'], $person_data[2] ) . '">';
-                               $size = 'compact' == $group_data['type'] ? '30' : '60';
-                               echo '<img src="' . $gravatar . $person_data[1] . '?s=' . $size . '" srcset="' . $gravatar . $person_data[1] . '?s=' . $size * 2 . ' 2x" class="gravatar" alt="' . esc_attr( $person_data[0] ) . '" /></a>' . "\n\t";
-                               echo '<a class="web" href="' . sprintf( $credits['data']['profiles'], $person_data[2] ) . '">' . $person_data[0] . "</a>\n\t";
+                               echo '<li class="wp-person" id="wp-person-' . esc_attr( $person_data[2] ) . '">' . "\n\t";
+                               echo '<a href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '">';
+                               $size = 'compact' == $group_data['type'] ? 30 : 60;
+                               $data = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
+                               $size *= 2;
+                               $data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
+                               echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="' . esc_attr( $person_data[0] ) . '" /></a>' . "\n\t";
+                               echo '<a class="web" href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '">' . esc_html( $person_data[0] ) . "</a>\n\t";
                                if ( ! $compact )
                                        echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
                                echo "</li>\n";