WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Editor: Remove default "layout" block attribute from WP_Block_Type::get_attributes 

The merging behavior which assigns the `layout` attribute in `WP_Block_Type` gets removed.

Props aduth, TimothyBlynJacobs.
Fixes #50257.


Built from https://develop.svn.wordpress.org/trunk@48118


git-svn-id: http://core.svn.wordpress.org/trunk@47887 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
gziolo 2020-06-22 12:22:08 +00:00
parent 29ffb31cb3
commit 85c5bca472
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wp-includes/class-wp-block-type.php
View File

@ -276,18 +276,7 @@ class WP_Block_Type {
*/ */
public function get_attributes() { public function get_attributes() {
return is_array( $this->attributes ) ? return is_array( $this->attributes ) ?
array_merge( $this->attributes :
$this->attributes, array();
array(
'layout' => array(
'type' => 'string',
),
)
) :
array(
'layout' => array(
'type' => 'string',
),
);
} }
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.5-alpha-48117'; $wp_version = '5.5-alpha-48118';
/** /**
* 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.