Changeset 14304

Timestamp:

04/29/2010 06:27:46 PM (15 years ago)

Author:

ryan

Message:

Fix initial hidden meta boxes for nav menus. see #13134

Location:

trunk/wp-admin

Files:

• includes/nav-menu.php (modified) (1 diff)
• nav-menus.php (modified) (2 diffs)

trunk/wp-admin/includes/nav-menu.php

@@ -322 +322 @@
     global $wp_meta_boxes;
 
-    if ( !get_user_option( 'meta-box-hidden_nav-menus' ) && is_array($wp_meta_boxes) ) {
-
-        $initial_meta_boxes = array( 'manage-menu', 'create-menu', 'add-custom-links', 'add-page', 'add-category' );
-        $hidden_meta_boxes = array();
-
-        foreach ( array_keys($wp_meta_boxes['nav-menus']) as $context ) {
-            foreach ( array_keys($wp_meta_boxes['nav-menus'][$context]) as $priority ) {
-                foreach ( $wp_meta_boxes['nav-menus'][$context][$priority] as $box ) {
-                    if ( in_array( $box['id'], $initial_meta_boxes ) ) {
-                        unset( $box['id'] );
-                    } else {
-                        $hidden_meta_boxes[] = $box['id'];
-                    }
+    if ( get_user_option( 'metaboxhidden_nav-menus' ) || ! is_array($wp_meta_boxes) )
+        return;
+    
+    $initial_meta_boxes = array( 'manage-menu', 'create-menu', 'add-custom-links', 'add-page', 'add-category' );
+    $hidden_meta_boxes = array();
+
+    foreach ( array_keys($wp_meta_boxes['nav-menus']) as $context ) {
+        foreach ( array_keys($wp_meta_boxes['nav-menus'][$context]) as $priority ) {
+            foreach ( $wp_meta_boxes['nav-menus'][$context][$priority] as $box ) {
+                if ( in_array( $box['id'], $initial_meta_boxes ) ) {
+                    unset( $box['id'] );
+                } else {
+                    $hidden_meta_boxes[] = $box['id'];
                 }
             }
         }
-        $user = wp_get_current_user();
-        update_user_option( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true );
-
-        // returns all the hidden metaboxes to the js function: wpNavMenu.initial_meta_boxes()
-        return join( ',', $hidden_meta_boxes );
-    }
+    }
+    $user = wp_get_current_user();
+    update_user_option( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true );
+    $option = get_user_option( 'metaboxhidden_nav-menus', $user->ID);
 }
 

trunk/wp-admin/nav-menus.php

@@ -319 +319 @@
     $messages[] = '<div id="message" class="error"><p>' . __('The current theme does not support menus.') . '</p></div>';
 }
+
+wp_initial_nav_menu_meta_boxes();
 
 // Get the admin header
@@ -404 +406 @@
                         <input type="hidden" name="action" value="update" />
                         <input type="hidden" name="menu" id="menu" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
-                        <input type="hidden" id="hidden-metaboxes" value="<?php echo wp_initial_nav_menu_meta_boxes(); ?>" />
                     </div><!--END #nav-menu-header-->
                     <div id="post-body">