Make WordPress Core

Changeset 53070


Ignore:
Timestamp:
04/05/2022 09:19:58 AM (2 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/.env

    r51868 r53070  
    2929# Supported values are `mysql` and `mariadb`.
    3030##
    31 LOCAL_DB_TYPE=mysql
     31LOCAL_DB_TYPE=mariadb
    3232
    3333##
     
    3939# When using `mariadb`, see https://hub.docker.com/_/mariadb for valid versions.
    4040##
    41 LOCAL_DB_VERSION=5.7
     41LOCAL_DB_VERSION=10
    4242
    4343# The debug settings to add to `wp-config.php`.
  • trunk/src/wp-admin/edit-form-blocks.php

    r52995 r53070  
    152152        $user         = get_userdata( $user_id );
    153153        $user_details = array(
    154             'name' => $user->display_name,
     154            'avatar' => get_avatar_url( $user_id, array( 'size' => 128 ) ),
     155            'name'   => $user->display_name,
    155156        );
    156         $avatar       = get_avatar_url( $user_id, array( 'size' => 64 ) );
    157157    }
    158158
  • trunk/src/wp-admin/includes/misc.php

    r53063 r53070  
    11381138                if ( $user && current_user_can( 'edit_post', $post_id ) ) {
    11391139                    $send = array(
     1140                        'name' => $user->display_name,
    11401141                        /* translators: %s: User's display name. */
    11411142                        'text' => sprintf( __( '%s is currently editing' ), $user->display_name ),
Note: See TracChangeset for help on using the changeset viewer.