Ticket #31004: add-srcset-to-avatars.diff

src/wp-includes/link-template.php

@@ -3401 +3401 @@
                 'rating'         => get_option( 'avatar_rating' ),
                 'scheme'         => null,
                 'processed_args' => null, // if used, should be a reference
+                'srcset_array'   => array(),
         ) );
 
         if ( is_numeric( $args['size'] ) ) {
@@ -3521 +3522 @@
                 'r' => $args['rating'],
         );
 
+        $url_args = array_filter( $url_args );
         $url = sprintf( 'http://%d.gravatar.com/avatar/%s', $gravatar_server, $email_hash );
 
         $url = add_query_arg(
-                rawurlencode_deep( array_filter( $url_args ) ),
+                rawurlencode_deep( $url_args ),
                 set_url_scheme( $url, $args['scheme'] )
         );
 
@@ -3539 +3541 @@
          */
         $args['url'] = apply_filters( 'get_avatar_url', $url, $id_or_email, $args );
 
+        if ( isset( $args['size'] ) ) {
+                if ( ! is_array( $args['srcset_array'] ) ) {
+                        $args['srcset_array'] = array();
+                }
+                $srcset_sizes = array(
+                        '1.5x' => 1.5,
+                        '2x'   => 2,
+                        '3x'   => 3,
+                );
+                foreach ( $srcset_sizes as $size_label => $multiplier ) {
+                        $srcset_url_args = wp_parse_args( array(
+                                's' => ceil( $args['size'] * $multiplier ),
+                        ), $url_args );
+                        $args['srcset_array'][ $size_label ] = add_query_arg(
+                                        rawurlencode_deep( $srcset_url_args ),
+                                        $args['url']
+                                );
+                }
+        }
+
         /**
          * Filter the avatar data.
          *

src/wp-includes/pluggable.php

@@ -2162 +2162 @@
 
         $url = $args['url'];
 
+        $srcset = esc_url( $url ) . ' 1x';
+        foreach ( $args['srcset_array'] as $srcset_size => $srcset_url ) {
+                $srcset .= ', ' . esc_url( $srcset_url ) . " {$srcset_size}";
+        }
+
         if ( ! $url || is_wp_error( $url ) ) {
         return false;
         }
@@ -2181 +2186 @@
         }
 
         $avatar = sprintf(
-                "<img alt='%s' src='%s' class='%s' height='%d' width='%d' />",
+                "<img alt='%s' src='%s' srcset='%s' class='%s' height='%d' width='%d' />",
                 esc_attr( $args['alt'] ),
                 esc_url( $url ),
+                esc_attr( $srcset ),
                 esc_attr( join( ' ', $class ) ),
                 (int) $args['size'],
                 (int) $args['size']