Changeset 44174 for trunk/src/wp-admin/includes/template.php

Timestamp:

12/14/2018 09:38:09 AM (8 years ago)

Author:

atimmer

Message:

Meta boxes: Don't assume that callback args are an array.

While the documentation for add_meta_box() specifices that $callback_args should be an array, this has never been enforced, and we have workarounds in place for when it's passed as something other than an array.

Rather than break sites that are passing unexpected data, we can quietly just allow for it, instead.

Props johnjamesjacoby, birgire, pento.
Merges [43838] to trunk.
Fixes #45206.

Location:

trunk

Files:

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

trunk/src/wp-admin/includes/template.php

@@ -1138 +1138 @@
                                         }
 
-                                        // Don't show boxes in the block editor, if they're just here for back compat.
-                                        if ( $screen->is_block_editor() && isset( $box['args']['__back_compat_meta_box'] ) && $box['args']['__back_compat_meta_box'] ) {
-                                                continue;
-                                        }
-
-                                        // Don't show boxes in the block editor that aren't compatible with the block editor.
-                                        if ( $screen->is_block_editor() && isset( $box['args']['__block_editor_compatible_meta_box'] ) && ! $box['args']['__block_editor_compatible_meta_box'] ) {
-                                                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'] );
-                                        }
-
-                                        if ( isset( $box['args']['__back_compat_meta_box'] ) ) {
-                                                $block_compatible |= (bool) $box['args']['__back_compat_meta_box'];
-                                                unset( $box['args']['__back_compat_meta_box'] );
+                                        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'] ) {
+                                                        continue;
+                                                }
+
+                                                // If a meta box doesn't work in the block editor, don't show it in the block editor.
+                                                if ( $screen->is_block_editor() && isset( $box['args']['__block_editor_compatible_meta_box'] ) && ! $box['args']['__block_editor_compatible_meta_box'] ) {
+                                                        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'] );
+                                                }
+
+                                                if ( isset( $box['args']['__back_compat_meta_box'] ) ) {
+                                                        $block_compatible = $block_compatible || (bool) $box['args']['__back_compat_meta_box'];
+                                                        unset( $box['args']['__back_compat_meta_box'] );
+                                                }
                                         }