Changeset 27251

Timestamp:

02/25/2014 12:50:36 AM (11 years ago)

Author:

SergeyBiryukov

Message:

Consistently return a WP_Error object in case of an error in wp_update_nav_menu_item().

props bootsz, ocean90.
fixes #21652.

File:

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

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

@@ -277 +277 @@
  * @param int $menu_item_db_id The ID of the menu item. If "0", creates a new menu item.
  * @param array $menu_item_data The menu item's data.
- * @return int The menu item's database ID or WP_Error object on failure.
+ * @return int|WP_Error The menu item's database ID or WP_Error object on failure.
  */
 function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item_data = array() ) {
@@ -285 +285 @@
     // make sure that we don't convert non-nav_menu_item objects into nav_menu_item objects
     if ( ! empty( $menu_item_db_id ) && ! is_nav_menu_item( $menu_item_db_id ) )
-        return new WP_Error('update_nav_menu_item_failed', __('The given object ID is not that of a menu item.'));
+        return new WP_Error( 'update_nav_menu_item_failed', __( 'The given object ID is not that of a menu item.' ) );
 
     $menu = wp_get_nav_menu_object( $menu_id );
 
-    if ( ( ! $menu && 0 !== $menu_id ) || is_wp_error( $menu ) )
+    if ( ! $menu && 0 !== $menu_id ) {
+        return new WP_Error( 'invalid_menu_id', __( 'Invalid menu ID.' ) );
+    }
+
+    if ( is_wp_error( $menu ) ) {
         return $menu;
+    }
 
     $defaults = array(