Changeset 51379

Timestamp:

07/07/2021 10:46:40 PM (3 years ago)

Author:

jorbin

Message:

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.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-includes/blocks.php (modified) (1 diff)

trunk/src/wp-includes/blocks.php

@@ -717 +717 @@
     );
 
-    $allowed_blocks = array_merge( $allowed_inner_blocks, $allowed_wrapper_blocks );
-
     /**
      * Filters the list of blocks that can be used as wrapper blocks, allowing