Changeset 30040

Timestamp:

10/27/2014 12:57:24 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Remove one-time loop and redundant isset() checks in do_meta_boxes().

See [30022] for do_accordion_sections().

props ipm-frommen.
fixes #30093.

File:

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

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

@@ -1005 +1005 @@
     printf('<div id="%s-sortables" class="meta-box-sortables">', htmlspecialchars($context));
 
-    $i = 0;
-    do {
-        // Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose
-        if ( !$already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) ) {
-            foreach ( $sorted as $box_context => $ids ) {
-                foreach ( explode(',', $ids ) as $id ) {
-                    if ( $id && 'dashboard_browser_nag' !== $id )
-                        add_meta_box( $id, null, null, $screen, $box_context, 'sorted' );
+    // Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose
+    if ( ! $already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) ) {
+        foreach ( $sorted as $box_context => $ids ) {
+            foreach ( explode( ',', $ids ) as $id ) {
+                if ( $id && 'dashboard_browser_nag' !== $id ) {
+                    add_meta_box( $id, null, null, $screen, $box_context, 'sorted' );
                 }
             }
         }
-        $already_sorted = true;
-
-        if ( !isset($wp_meta_boxes) || !isset($wp_meta_boxes[$page]) || !isset($wp_meta_boxes[$page][$context]) )
-            break;
-
-        foreach ( array('high', 'sorted', 'core', 'default', 'low') as $priority ) {
-            if ( isset($wp_meta_boxes[$page][$context][$priority]) ) {
-                foreach ( (array) $wp_meta_boxes[$page][$context][$priority] as $box ) {
+    }
+
+    $already_sorted = true;
+
+    $i = 0;
+
+    if ( isset( $wp_meta_boxes[ $page ][ $context ] ) ) {
+        foreach ( array( 'high', 'sorted', 'core', 'default', 'low' ) as $priority ) {
+            if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ]) ) {
+                foreach ( (array) $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
                     if ( false == $box || ! $box['title'] )
                         continue;
@@ -1039 +1039 @@
             }
         }
-    } while(0);
+    }
 
     echo "</div>";