Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-25 06:14:58 +02:00
Code Issues Projects Releases Wiki Activity

Meta boxes: Don't show the block editor incompatiblity message when it doesn't apply.

Browse Source 
We should only be showing this message in the classic editor interface, for meta boxes that are marked as being incompatible with the block editor.

Fixes #45207.


Built from https://develop.svn.wordpress.org/branches/5.0@43839


git-svn-id: http://core.svn.wordpress.org/branches/5.0@43668 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2018-10-29 08:31:06 +00:00
parent 3549683ca3
commit f2e3a6c1ac
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/template.php
View File

@ -1052,6 +1052,7 @@ function do_meta_boxes( $screen, $context, $object ) {
if ( false == $box || ! $box['title'] )
continue;
$block_compatible = true;
if ( is_array( $box[ 'args' ] ) ) {
// If a meta box is just here for back compat, don't show it in the block editor.
if ( $screen->is_block_editor() && isset( $box['args']['__back_compat_meta_box'] ) && $box['args']['__back_compat_meta_box'] ) {
@ -1063,7 +1064,6 @@ function do_meta_boxes( $screen, $context, $object ) {
continue;
}
$block_compatible = true;
if ( isset( $box['args']['__block_editor_compatible_meta_box'] ) ) {
$block_compatible = (bool) $box['args']['__block_editor_compatible_meta_box'];
unset( $box['args']['__block_editor_compatible_meta_box'] );
@ -1095,7 +1095,7 @@ function do_meta_boxes( $screen, $context, $object ) {
echo "<h2 class='hndle'><span>{$box['title']}</span></h2>\n";
echo '<div class="inside">' . "\n";
if ( WP_DEBUG && ! $screen->is_block_editor() && ! isset( $_GET['meta-box-loader'] ) ) {
if ( WP_DEBUG && ! $block_compatible && 'edit' === $screen->parent_base && ! $screen->is_block_editor() && ! isset( $_GET['meta-box-loader'] ) ) {
if ( is_array( $box['callback'] ) ) {
$reflection = new ReflectionMethod( $box['callback'][0], $box['callback'][1] );
} elseif ( false !== strpos( $box['callback'], '::' ) ) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.0-beta1-43838';
$wp_version = '5.0-beta1-43839';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.