Changeset 48318

Timestamp:

07/05/2020 12:58:20 PM (6 years ago)

Author:

ocean90

Message:

Posts: Provide a HiDPI version for the avatar used in post locked dialogs.

Props wpdesk, audrasjb, ocean90.
Fixes #39633.

Location:

trunk/src

Files:

• js/_enqueues/admin/inline-edit-post.js (modified) (1 diff)
• js/_enqueues/admin/post.js (modified) (1 diff)
• wp-admin/includes/misc.php (modified) (2 diffs)

trunk/src/js/_enqueues/admin/inline-edit-post.js

@@ -530 +530 @@
 
                 if ( lock_data.avatar_src ) {
-                    avatar = $( '<img class="avatar avatar-18 photo" width="18" height="18" alt="" />' ).attr( 'src', lock_data.avatar_src.replace( /&amp;/g, '&' ) );
+                    avatar = $( '<img />', {
+                        'class': 'avatar avatar-18 photo',
+                        width: 18,
+                        height: 18,
+                        alt: '',
+                        src: lock_data.avatar_src,
+                        srcset: lock_data.avatar_src_2x ? lock_data.avatar_src_2x + ' 2x' : undefined
+                    } );
                     row.find('.column-title .locked-avatar').empty().append( avatar );
                 }

trunk/src/js/_enqueues/admin/post.js

@@ -201 +201 @@
 
                     if ( received.lock_error.avatar_src ) {
-                        avatar = $( '<img class="avatar avatar-64 photo" width="64" height="64" alt="" />' ).attr( 'src', received.lock_error.avatar_src.replace( /&amp;/g, '&' ) );
+                        avatar = $( '<img />', {
+                            'class': 'avatar avatar-64 photo',
+                            width: 64,
+                            height: 64,
+                            alt: '',
+                            src: received.lock_error.avatar_src,
+                            srcset: received.lock_error.avatar_src_2x ? received.lock_error.avatar_src_2x + ' 2x' : undefined
+                        } );
                         wrap.find('div.post-locked-avatar').empty().append( avatar );
                     }

trunk/src/wp-admin/includes/misc.php

@@ -1054 +1054 @@
                     );
 
-                    $avatar = get_avatar( $user->ID, 18 );
-                    if ( $avatar && preg_match( "|src='([^']+)'|", $avatar, $matches ) ) {
-                        $send['avatar_src'] = $matches[1];
+                    if ( get_option( 'show_avatars' ) ) {
+                        $send['avatar_src']    = get_avatar_url( $user->ID, array( 'size' => 18 ) );
+                        $send['avatar_src_2x'] = get_avatar_url( $user->ID, array( 'size' => 36 ) );
                     }
 
@@ -1104 +1104 @@
             );
 
-            $avatar = get_avatar( $user->ID, 64 );
-            if ( $avatar ) {
-                if ( preg_match( "|src='([^']+)'|", $avatar, $matches ) ) {
-                    $error['avatar_src'] = $matches[1];
-                }
+            if ( get_option( 'show_avatars' ) ) {
+                $error['avatar_src']    = get_avatar_url( $user->ID, array( 'size' => 64 ) );
+                $error['avatar_src_2x'] = get_avatar_url( $user->ID, array( 'size' => 128 ) );
             }