Changeset 14934

Timestamp:

05/26/2010 05:11:46 AM (15 years ago)

Author:

nacin

Message:

Don't store nonexistent (deleted) menus in the auto-add option. see #13447.

Location:

trunk

Files:

• wp-admin/nav-menus.php (modified) (1 diff)
• wp-includes/nav-menu.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (1 diff)

trunk/wp-admin/nav-menus.php

@@ -369 +369 @@
                         unset( $nav_menu_option['auto_add'][$key] );
                 }
+                // Remove nonexistent/deleted menus
+                $nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' => 'ids' ) ) );
                 update_option( 'nav_menu_options', $nav_menu_option );
 

trunk/wp-includes/nav-menu.php

@@ -766 +766 @@
 
     foreach ( $auto_add as $menu_id ) {
-        $items = (array) wp_get_nav_menu_items( $menu_id );
+        $items = wp_get_nav_menu_items( $menu_id );
+        if ( ! is_array( $items ) )
+            continue;
         foreach ( $items as $item ) {
             if ( $post->ID == $item->object_id )

trunk/wp-includes/taxonomy.php

@@ -715 +715 @@
  * The 'get_terms_orderby' filter passes the ORDER BY clause for the query
  * along with the $args array.
-
+ *
  * The 'get_terms_fields' filter passes the fields for the SELECT query
  * along with the $args array.