Changeset 58822 for trunk/src/wp-includes/link-template.php

Timestamp:

07/29/2024 01:57:11 AM (11 months ago)

Author:

peterwilsoncc

Message:

Users: Always use HTTPS URLs for Gravatar links.

Modifies gravatar image URLs to always use the HTTPS version from secure.gravatar.com.

Gravatar now redirects HTTP image requests to their HTTPS equivalent, resulting in redirects for sites running over an HTTP connection (is_ssl() === false). Since the introduction of HTTP/2 the use of sub-domains for different hashes ([1-3].gravatar.com) now represents a performance hinderance rather than improvement.

The scheme passed to get_avatar_data() is now ignored for the generation of Gravatar URLs but the setting retained to avoid introducing bugs for sites using either local avatars or third party providers.

Props neoxx, SergeyBiryukov, sippis, peterwilsoncc, mukesh27, costdev, dd32.
Fixes #37454.

File:

• trunk/src/wp-includes/link-template.php (modified) (4 diffs)

trunk/src/wp-includes/link-template.php

@@ -4329 +4329 @@
  *
  * @since 4.2.0
+ * @since 6.7.0 Gravatar URLs always use HTTPS.
  *
  * @param mixed $id_or_email The avatar to retrieve. Accepts a user ID, Gravatar MD5 hash,
@@ -4359 +4360 @@
  *                                  Default is the value of the 'avatar_rating' option.
  *     @type string $scheme         URL scheme to use. See set_url_scheme() for accepted values.
+ *                                  For Gravatars this setting is ignored and HTTPS is used to avoid
+ *                                  unnecessary redirects. The setting is retained for systems using
+ *                                  the {@see 'pre_get_avatar_data'} filter to customize avatars.
  *                                  Default null.
  *     @type array  $processed_args When the function returns, the value will be the processed/sanitized $args
@@ -4509 +4513 @@
     if ( $email_hash ) {
         $args['found_avatar'] = true;
-        $gravatar_server      = hexdec( $email_hash[0] ) % 3;
-    } else {
-        $gravatar_server = rand( 0, 2 );
     }
 
@@ -4521 +4522 @@
     );
 
-    if ( is_ssl() ) {
-        $url = 'https://secure.gravatar.com/avatar/' . $email_hash;
-    } else {
-        $url = sprintf( 'http://%d.gravatar.com/avatar/%s', $gravatar_server, $email_hash );
-    }
+    /*
+     * Gravatars are always served over HTTPS.
+     *
+     * The Gravatar website redirects HTTP requests to HTTPS URLs so always
+     * use the HTTPS scheme to avoid unnecessary redirects.
+     */
+    $url = 'https://secure.gravatar.com/avatar/' . $email_hash;
 
     $url = add_query_arg(
         rawurlencode_deep( array_filter( $url_args ) ),
-        set_url_scheme( $url, $args['scheme'] )
+        $url
     );