From b053b80b598f85cf66eceb0593e6d2ac72e5fa7c Mon Sep 17 00:00:00 2001 From: Anton Timmermans Date: Fri, 14 Dec 2018 09:41:56 +0000 Subject: [PATCH] Meta boxes: Don't show the block editor incompatiblity message when it doesn't apply. 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. Props pento. Merges [43839] to trunk. Fixes #45207. git-svn-id: https://develop.svn.wordpress.org/trunk@44175 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/template.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php index 336e353a28..04e081cbf4 100644 --- a/src/wp-admin/includes/template.php +++ b/src/wp-admin/includes/template.php @@ -1137,6 +1137,7 @@ function do_meta_boxes( $screen, $context, $object ) { 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'] ) { @@ -1148,7 +1149,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'] ); @@ -1186,7 +1186,7 @@ function do_meta_boxes( $screen, $context, $object ) { echo "\n"; echo '
' . "\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'], '::' ) ) {