Changeset 27556 for trunk/src/wp-includes/nav-menu.php

Timestamp:

03/15/2014 06:06:41 AM (11 years ago)

Author:

nacin

Message:

Explicitly assign menu term relationship rather than piggybacking on wp_insert_post() with the tax_input argument.

That argument currently depends on user context (see #19373).

Adds unit test for properly updating orphaned menu items.

props danielbachhuber.
fixes #27113.

File:

• trunk/src/wp-includes/nav-menu.php (modified) (2 diffs)

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

@@ -366 +366 @@
     $update = 0 != $menu_item_db_id;
 
-    // Only set the menu term if it isn't set to avoid unnecessary wp_get_object_terms()
-    if ( $menu_id && ( ! $update || ! is_object_in_term( $menu_item_db_id, 'nav_menu', (int) $menu->term_id ) ) )
-        $post['tax_input'] = array( 'nav_menu' => array( intval( $menu->term_id ) ) );
-
     // New menu item. Default is draft status
     if ( ! $update ) {
@@ -377 +373 @@
         if ( ! $menu_item_db_id || is_wp_error( $menu_item_db_id ) )
             return $menu_item_db_id;
+    }
+
+    // Associate the menu item with the menu term
+    // Only set the menu term if it isn't set to avoid unnecessary wp_get_object_terms()
+     if ( $menu_id && ( ! $update || ! is_object_in_term( $menu_item_db_id, 'nav_menu', (int) $menu->term_id ) ) ) {
+        wp_set_object_terms( $menu_item_db_id, array( $menu->term_id ), 'nav_menu' );
     }