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

Fix merge info. 

[51378] contained merge info it shouldn't and accidentally a line of code from one of those commits that another one had changed.

See #53604.
Unprops jorbin.


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


git-svn-id: http://core.svn.wordpress.org/trunk@50990 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Aaron Jorbin 2021-07-07 22:47:56 +00:00
parent f4acd73b70
commit 381a720ea9
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/blocks.php
View File

@ -716,8 +716,6 @@ function excerpt_remove_blocks( $content ) {
'core/group', 'core/group',
); );
$allowed_blocks = array_merge( $allowed_inner_blocks, $allowed_wrapper_blocks );
/** /**
* Filters the list of blocks that can be used as wrapper blocks, allowing * Filters the list of blocks that can be used as wrapper blocks, allowing
* excerpts to be generated from the `innerBlocks` of these wrappers. * excerpts to be generated from the `innerBlocks` of these wrappers.

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.9-alpha-51378'; $wp_version = '5.9-alpha-51379';
/** /**
* 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.