From f5cc51c8ca55a38020899670d4a7dbab467ca965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Greg=20Zi=C3=83=C2=B3=C3=85=E2=80=9Akowski?=
 <gziolo@git.wordpress.org>
Date: Tue, 5 Apr 2022 09:19:58 +0000
Subject: [PATCH] Editor: Fix post lock data inconsistencies

Backporting fixes introduced in WordPress/gutenberg#37914.

Props Mamaduka.
Fixes #55238.



git-svn-id: https://develop.svn.wordpress.org/trunk@53070 602fd350-edb4-49c9-b593-d223f7449a82
---
 .env                              | 4 ++--
 src/wp-admin/edit-form-blocks.php | 4 ++--
 src/wp-admin/includes/misc.php    | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.env b/.env
index 9affb93f53..05cf96ffd2 100644
--- a/.env
+++ b/.env
@@ -28,7 +28,7 @@ LOCAL_PHP_MEMCACHED=false
 #
 # Supported values are `mysql` and `mariadb`.
 ##
-LOCAL_DB_TYPE=mysql
+LOCAL_DB_TYPE=mariadb
 
 ##
 # The database version to use.
@@ -38,7 +38,7 @@ LOCAL_DB_TYPE=mysql
 # When using `mysql`, see https://hub.docker.com/_/mysql/ for valid versions.
 # 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`.
 LOCAL_WP_DEBUG=true
diff --git a/src/wp-admin/edit-form-blocks.php b/src/wp-admin/edit-form-blocks.php
index 9d683b2afd..e26ae1af6f 100644
--- a/src/wp-admin/edit-form-blocks.php
+++ b/src/wp-admin/edit-form-blocks.php
@@ -151,9 +151,9 @@ if ( $user_id ) {
 	if ( $locked ) {
 		$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 ) );
 	}
 
 	$lock_details = array(
diff --git a/src/wp-admin/includes/misc.php b/src/wp-admin/includes/misc.php
index 3b4b6f3e47..c36f487b54 100644
--- a/src/wp-admin/includes/misc.php
+++ b/src/wp-admin/includes/misc.php
@@ -1137,6 +1137,7 @@ function wp_check_locked_posts( $response, $data, $screen_id ) {
 
 				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 ),
 					);