<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14304] trunk/wp-admin: Fix initial hidden meta boxes for nav menus.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14304">14304</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-04-29 18:27:46 +0000 (Thu, 29 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix initial hidden meta boxes for nav menus. see <a href="http://trac.wordpress.org/ticket/13134">#13134</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesnavmenuphp">trunk/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/nav-menu.php (14303 => 14304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php 2010-04-29 18:24:45 UTC (rev 14303)
+++ trunk/wp-admin/includes/nav-menu.php 2010-04-29 18:27:46 UTC (rev 14304)
</span><span class="lines">@@ -321,28 +321,26 @@
</span><span class="cx"> function wp_initial_nav_menu_meta_boxes() {
</span><span class="cx"> global $wp_meta_boxes;
</span><span class="cx">
</span><del>- if ( !get_user_option( 'meta-box-hidden_nav-menus' ) && is_array($wp_meta_boxes) ) {
</del><ins>+ 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();
</ins><span class="cx">
</span><del>- $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'];
- }
</del><ins>+ 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'];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- $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 );
</del><span class="cx"> }
</span><ins>+ $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);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (14303 => 14304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2010-04-29 18:24:45 UTC (rev 14303)
+++ trunk/wp-admin/nav-menus.php 2010-04-29 18:27:46 UTC (rev 14304)
</span><span class="lines">@@ -319,6 +319,8 @@
</span><span class="cx"> $messages[] = '<div id="message" class="error"><p>' . __('The current theme does not support menus.') . '</p></div>';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+wp_initial_nav_menu_meta_boxes();
+
</ins><span class="cx"> // Get the admin header
</span><span class="cx"> require_once( 'admin-header.php' );
</span><span class="cx"> ?>
</span><span class="lines">@@ -403,7 +405,6 @@
</span><span class="cx"> <?php wp_nonce_field( 'update-nav_menu', 'update-nav-menu-nonce' ); ?>
</span><span class="cx"> <input type="hidden" name="action" value="update" />
</span><span class="cx"> <input type="hidden" name="menu" id="menu" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
</span><del>- <input type="hidden" id="hidden-metaboxes" value="<?php echo wp_initial_nav_menu_meta_boxes(); ?>" />
</del><span class="cx"> </div><!--END #nav-menu-header-->
</span><span class="cx"> <div id="post-body">
</span><span class="cx"> <div id="post-body-content">
</span></span></pre>
</div>
</div>
</body>
</html>