Ticket #31469: miqro-31469.diff

src/wp-includes/link-template.php

@@ -3422 +3422 @@
  * @param array $args        {
  *     Optional. Arguments to return instead of the default arguments.
  *
- *     @type int    $size           Height and width of the avatar in pixels. Default 96.
+ *     @type int    $size           Height and width of the avatar image file in pixels. Default 96.
+ *     @type int    $height         Display height of the avatar in pixels. Default 96.
+ *     @type int    $width          Display width of the avatar in pixels. Default 96.
  *     @type string $default        URL for the default image or a default type. Accepts '404' (return
  *                                  a 404 instead of a default image), 'retro' (8bit), 'monsterid' (monster),
  *                                  'wavatar' (cartoon face), 'indenticon' (the "quilt"), 'mystery', 'mm',
@@ -3449 +3451 @@
 function get_avatar_data( $id_or_email, $args = null ) {
         $args = wp_parse_args( $args, array(
                 'size'           => 96,
+                'height'         => 96,
+                'width'          => 96,
                 'default'        => get_option( 'avatar_default', 'mystery' ),
                 'force_default'  => false,
                 'rating'         => get_option( 'avatar_rating' ),
@@ -3465 +3469 @@
                 $args['size'] = 96;
         }
 
+        if ( is_numeric( $args['height'] ) ) {
+                $args['height'] = absint( $args['height'] );
+                if ( ! $args['height'] ) {
+                        $args['height'] = 96;
+                }
+        } else {
+                $args['height'] = 96;
+        }
+
+        if ( is_numeric( $args['width'] ) ) {
+                $args['width'] = absint( $args['width'] );
+                if ( ! $args['width'] ) {
+                        $args['width'] = 96;
+                }
+        } else {
+                $args['width'] = 96;
+        }
+
         if ( empty( $args['default'] ) ) {
                 $args['default'] = get_option( 'avatar_default', 'mystery' );
         }

src/wp-includes/pluggable.php

@@ -2143 +2143 @@
         }
 
         $args['size']    = $size;
+        $args['width']   = $size;
+        $args['height']  = $size;
         $args['default'] = $default;
         $args['alt']     = $alt;
 
@@ -2197 +2199 @@
                 esc_attr( $args['alt'] ),
                 esc_url( $url ),
                 esc_attr( join( ' ', $class ) ),
-                (int) $args['size'],
-                (int) $args['size']
+                (int) $args['height'],
+                (int) $args['width']
         );
 
         /**