WordPress-C/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-17 12:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Editor: Respect show_avatars option in block editor and Customizer.

Browse Source 
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.
Built from https://develop.svn.wordpress.org/trunk@59078


git-svn-id: http://core.svn.wordpress.org/trunk@58474 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2024-09-22 22:50:18 +00:00
parent d2c835af27
commit 82c0168bbd
7 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/css/customize-controls-rtl.css
View File

@ -32,7 +32,7 @@ body {
max-width: 366px; max-width: 366px;
min-height: 64px; min-height: 64px;
width: auto; width: auto;
padding: 25px 109px 25px 25px; padding: 25px;
position: relative; position: relative;
background: #fff; background: #fff;
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.3); box-shadow: 0 3px 6px rgba(0, 0, 0, 0.3);
@ -42,6 +42,10 @@ body {
top: calc( 50% - 100px ); 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 { #customize-controls #customize-notifications-area .notice.notification-overlay.notification-changeset-locked .currently-editing {
margin-top: 0; margin-top: 0;
} }

2
wp-admin/css/customize-controls-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

6
wp-admin/css/customize-controls.css
View File

@ -31,7 +31,7 @@ body {
max-width: 366px; max-width: 366px;
min-height: 64px; min-height: 64px;
width: auto; width: auto;
padding: 25px 25px 25px 109px; padding: 25px;
position: relative; position: relative;
background: #fff; background: #fff;
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.3); box-shadow: 0 3px 6px rgba(0, 0, 0, 0.3);
@ -41,6 +41,10 @@ body {
top: calc( 50% - 100px ); 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 { #customize-controls #customize-notifications-area .notice.notification-overlay.notification-changeset-locked .currently-editing {
margin-top: 0; margin-top: 0;
} }

2
wp-admin/css/customize-controls.min.css vendored
View File

File diff suppressed because one or more lines are too long

7
wp-admin/edit-form-blocks.php
View File

@ -160,9 +160,12 @@ if ( $user_id ) {
if ( $locked ) { if ( $locked ) {
$user = get_userdata( $user_id ); $user = get_userdata( $user_id );
$user_details = array( $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( $lock_details = array(

19
wp-includes/class-wp-customize-manager.php
View File

@ -3334,11 +3334,16 @@ final class WP_Customize_Manager {
return null; return null;
} }
return array( $user_details = array(
'id' => $lock_user->ID, 'id' => $lock_user->ID,
'name' => $lock_user->display_name, 'name' => $lock_user->display_name,
'avatar' => get_avatar_url( $lock_user->ID, array( 'size' => 128 ) ),
); );
if ( get_option( 'show_avatars' ) ) {
$user_details['avatar'] = get_avatar_url( $lock_user->ID, array( 'size' => 128 ) );
}
return $user_details;
} }
/** /**
@ -4307,8 +4312,10 @@ final class WP_Customize_Manager {
<script type="text/html" id="tmpl-customize-changeset-locked-notification"> <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 }}"> <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"> <div class="notification-message customize-changeset-locked-message {{ data.lockUser.avatar ? 'has-avatar' : '' }}">
<img class="customize-changeset-locked-avatar" src="{{ data.lockUser.avatar }}" alt="{{ data.lockUser.name }}" /> <# if ( data.lockUser.avatar ) { #>
<img class="customize-changeset-locked-avatar" src="{{ data.lockUser.avatar }}" alt="{{ data.lockUser.name }}" />
<# } #>
<p class="currently-editing"> <p class="currently-editing">
<# if ( data.message ) { #> <# if ( data.message ) { #>
{{{ data.message }}} {{{ data.message }}}

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.