Merge branch 'trunk' of git://core.git.wordpress.org into trunk

gilzow · Sep 22, 2024 · 26c3015 · 26c3015
2 parents 5040ed9 + c67b35f
commit 26c3015
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 13 deletions.
diff --git a/wp-admin/css/customize-controls-rtl.css b/wp-admin/css/customize-controls-rtl.css
@@ -32,7 +32,7 @@ body {
 	max-width: 366px;
 	min-height: 64px;
 	width: auto;
-	padding: 25px 109px 25px 25px;
+	padding: 25px;
 	position: relative;
 	background: #fff;
 	box-shadow: 0 3px 6px rgba(0, 0, 0, 0.3);
@@ -42,6 +42,10 @@ body {
 	top: calc( 50% - 100px );
 }
 
+#customize-controls #customize-notifications-area .notice.notification-overlay.notification-changeset-locked .customize-changeset-locked-message.has-avatar {
+	padding-right: 109px;
+}
+
 #customize-controls #customize-notifications-area .notice.notification-overlay.notification-changeset-locked .currently-editing {
 	margin-top: 0;
 }

diff --git a/wp-admin/css/customize-controls-rtl.min.css b/wp-admin/css/customize-controls-rtl.min.css
diff --git a/wp-admin/css/customize-controls.css b/wp-admin/css/customize-controls.css
@@ -31,7 +31,7 @@ body {
 	max-width: 366px;
 	min-height: 64px;
 	width: auto;
-	padding: 25px 25px 25px 109px;
+	padding: 25px;
 	position: relative;
 	background: #fff;
 	box-shadow: 0 3px 6px rgba(0, 0, 0, 0.3);
@@ -41,6 +41,10 @@ body {
 	top: calc( 50% - 100px );
 }
 
+#customize-controls #customize-notifications-area .notice.notification-overlay.notification-changeset-locked .customize-changeset-locked-message.has-avatar {
+	padding-left: 109px;
+}
+
 #customize-controls #customize-notifications-area .notice.notification-overlay.notification-changeset-locked .currently-editing {
 	margin-top: 0;
 }

diff --git a/wp-admin/css/customize-controls.min.css b/wp-admin/css/customize-controls.min.css
diff --git a/wp-admin/edit-form-blocks.php b/wp-admin/edit-form-blocks.php
@@ -160,9 +160,12 @@ static function ( $classes ) {
 	if ( $locked ) {
 		$user         = get_userdata( $user_id );
 		$user_details = array(
-			'avatar' => get_avatar_url( $user_id, array( 'size' => 128 ) ),
-			'name'   => $user->display_name,
+			'name' => $user->display_name,
 		);
+
+		if ( get_option( 'show_avatars' ) ) {
+			$user_details['avatar'] = get_avatar_url( $user_id, array( 'size' => 128 ) );
+		}
 	}
 
 	$lock_details = array(

diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php
@@ -3334,11 +3334,16 @@ protected function get_lock_user_data( $user_id ) {
 			return null;
 		}
 
-		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;
 	}
 
 	/**
@@ -4307,8 +4312,10 @@ public function render_control_templates() {
 
 		<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 ) { #>
 							{{{ data.message }}}

diff --git a/wp-includes/version.php b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.7-alpha-59077';
+$wp_version = '6.7-alpha-59078';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.