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

Timestamp:

05/09/2020 12:24:31 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Administration: Avoid a PHP 7.4 notice in add_meta_box() when attempting to re-add a previously removed box.

The logic for skipping previously removed meta boxes with the core priority should also apply to the sorted priority that is used when the boxes were manually reordered.

Add a unit test.

Props coolmann, franzarmas, SergeyBiryukov.
Fixes #50019.

File:

• trunk/src/wp-admin/includes/template.php (modified) (2 diffs)

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

@@ -1064 +1064 @@
             }
 
-            // If a core box was previously added or removed by a plugin, don't add.
+            // If a core box was previously removed, don't add.
+            if ( ( 'core' === $priority || 'sorted' === $priority )
+                && false === $wp_meta_boxes[ $page ][ $a_context ][ $a_priority ][ $id ]
+            ) {
+                return;
+            }
+
+            // If a core box was previously added by a plugin, don't add.
             if ( 'core' === $priority ) {
-                // If core box previously deleted, don't add.
-                if ( false === $wp_meta_boxes[ $page ][ $a_context ][ $a_priority ][ $id ] ) {
-                    return;
-                }
-
                 /*
-                 * If box was added with default priority, give it core priority to
-                 * maintain sort order.
+                 * If the box was added with default priority, give it core priority
+                 * to maintain sort order.
                  */
                 if ( 'default' === $a_priority ) {
@@ -1081 +1083 @@
                 return;
             }
+
             // If no priority given and ID already present, use existing priority.
             if ( empty( $priority ) ) {
                 $priority = $a_priority;
                 /*
-                * Else, if we're adding to the sorted priority, we don't know the title
-                * or callback. Grab them from the previously added context/priority.
-                */
+                 * Else, if we're adding to the sorted priority, we don't know the title
+                 * or callback. Grab them from the previously added context/priority.
+                 */
             } elseif ( 'sorted' === $priority ) {
                 $title         = $wp_meta_boxes[ $page ][ $a_context ][ $a_priority ][ $id ]['title'];