Changeset 59078 for trunk/src/wp-includes/class-wp-customize-manager.php

Timestamp:

09/22/2024 10:48:04 PM (6 months ago)

Author:

SergeyBiryukov

Message:

Editor: Respect show_avatars option in block editor and Customizer.

This adds checks for the show_avatars option before setting the avatar for post lock modals in the block editor and the Customizer.

Follow-up to [41839], [53070].

Props ffffelix.
Fixes #62081.

File:

• trunk/src/wp-includes/class-wp-customize-manager.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -3335 +3335 @@
         }
 
-        return array(
-            'id'     => $lock_user->ID,
-            'name'   => $lock_user->display_name,
-            'avatar' => get_avatar_url( $lock_user->ID, array( 'size' => 128 ) ),
-        );
+        $user_details = array(
+            'id'   => $lock_user->ID,
+            'name' => $lock_user->display_name,
+        );
+
+        if ( get_option( 'show_avatars' ) ) {
+            $user_details['avatar'] = get_avatar_url( $lock_user->ID, array( 'size' => 128 ) );
+        }
+
+        return $user_details;
     }
 
@@ -4308 +4313 @@
         <script type="text/html" id="tmpl-customize-changeset-locked-notification">
             <li class="notice notice-{{ data.type || 'info' }} {{ data.containerClasses || '' }}" data-code="{{ data.code }}" data-type="{{ data.type }}">
-                <div class="notification-message customize-changeset-locked-message">
-                    <img class="customize-changeset-locked-avatar" src="{{ data.lockUser.avatar }}" alt="{{ data.lockUser.name }}" />
+                <div class="notification-message customize-changeset-locked-message {{ data.lockUser.avatar ? 'has-avatar' : '' }}">
+                    <# if ( data.lockUser.avatar ) { #>
+                        <img class="customize-changeset-locked-avatar" src="{{ data.lockUser.avatar }}" alt="{{ data.lockUser.name }}" />
+                    <# } #>
                     <p class="currently-editing">
                         <# if ( data.message ) { #>