Changeset 53070

Timestamp:

04/05/2022 09:19:58 AM (3 years ago)

Author:

gziolo

Message:

Editor: Fix post lock data inconsistencies

Backporting fixes introduced in WordPress/gutenberg#37914.

Props Mamaduka.
Fixes #55238.

Location:

trunk

Files:

• .env (modified) (2 diffs)
• src/wp-admin/edit-form-blocks.php (modified) (1 diff)
• src/wp-admin/includes/misc.php (modified) (1 diff)

trunk/.env

@@ -29 +29 @@
 # Supported values are `mysql` and `mariadb`.
 ##
-LOCAL_DB_TYPE=mysql
+LOCAL_DB_TYPE=mariadb
 
 ##
@@ -39 +39 @@
 # When using `mariadb`, see https://hub.docker.com/_/mariadb for valid versions.
 ##
-LOCAL_DB_VERSION=5.7
+LOCAL_DB_VERSION=10
 
 # The debug settings to add to `wp-config.php`.

trunk/src/wp-admin/edit-form-blocks.php

@@ -152 +152 @@
         $user         = get_userdata( $user_id );
         $user_details = array(
-            'name' => $user->display_name,
+            'avatar' => get_avatar_url( $user_id, array( 'size' => 128 ) ),
+            'name'   => $user->display_name,
         );
-        $avatar       = get_avatar_url( $user_id, array( 'size' => 64 ) );
     }
 

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

@@ -1138 +1138 @@
                 if ( $user && current_user_can( 'edit_post', $post_id ) ) {
                     $send = array(
+                        'name' => $user->display_name,
                         /* translators: %s: User's display name. */
                         'text' => sprintf( __( '%s is currently editing' ), $user->display_name ),