<!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>[14934] trunk: Don't store nonexistent (deleted)
  menus in the auto-add option.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14934">14934</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-26 05:11:46 +0000 (Wed, 26 May 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Don't store nonexistent (deleted) menus in the auto-add option. see <a href="http://trac.wordpress.org/ticket/13447">#13447</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
<li><a href="#trunkwpincludesnavmenuphp">trunk/wp-includes/nav-menu.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (14933 => 14934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php        2010-05-26 04:55:21 UTC (rev 14933)
+++ trunk/wp-admin/nav-menus.php        2010-05-26 05:11:46 UTC (rev 14934)
</span><span class="lines">@@ -368,6 +368,8 @@
</span><span class="cx">                                         if ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) )
</span><span class="cx">                                                 unset( $nav_menu_option['auto_add'][$key] );
</span><span class="cx">                                 }
</span><ins>+                                // Remove nonexistent/deleted menus
+                                $nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' =&gt; 'ids' ) ) );
</ins><span class="cx">                                 update_option( 'nav_menu_options', $nav_menu_option );
</span><span class="cx"> 
</span><span class="cx">                                 wp_defer_term_counting(false);
</span></span></pre></div>
<a id="trunkwpincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu.php (14933 => 14934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php        2010-05-26 04:55:21 UTC (rev 14933)
+++ trunk/wp-includes/nav-menu.php        2010-05-26 05:11:46 UTC (rev 14934)
</span><span class="lines">@@ -765,7 +765,9 @@
</span><span class="cx">         );
</span><span class="cx"> 
</span><span class="cx">         foreach ( $auto_add as $menu_id ) {
</span><del>-                $items = (array) wp_get_nav_menu_items( $menu_id );
</del><ins>+                $items = wp_get_nav_menu_items( $menu_id );
+                if ( ! is_array( $items ) )
+                        continue;
</ins><span class="cx">                 foreach ( $items as $item ) {
</span><span class="cx">                         if ( $post-&gt;ID == $item-&gt;object_id )
</span><span class="cx">                                 continue 2;
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (14933 => 14934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php        2010-05-26 04:55:21 UTC (rev 14933)
+++ trunk/wp-includes/taxonomy.php        2010-05-26 05:11:46 UTC (rev 14934)
</span><span class="lines">@@ -714,7 +714,7 @@
</span><span class="cx">  *
</span><span class="cx">  * The 'get_terms_orderby' filter passes the ORDER BY clause for the query
</span><span class="cx">  * along with the $args array.
</span><del>-
</del><ins>+ *
</ins><span class="cx">  * The 'get_terms_fields' filter passes the fields for the SELECT query
</span><span class="cx">  * along with the $args array.
</span><span class="cx">  *
</span></span></pre>
</div>
</div>

</body>
</html>