Changeset 14283 for trunk/wp-includes/nav-menu.php

Timestamp:

04/28/2010 06:30:32 PM (15 years ago)

Author:

nacin

Message:

More nav menu fixes. props filosofo. see #13148. fixes #13155, fixes #13157, fixes #13138, see #13134.

File:

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

trunk/wp-includes/nav-menu.php

@@ -51 +51 @@
     $menu_obj = wp_get_nav_menu_object( $menu );
 
-    if ( $menu_obj && ! is_wp_error( $menu_obj ) && ! empty( $menu_obj->term_id ) ) 
+    if ( 
+        $menu_obj && 
+        ! is_wp_error( $menu_obj ) && 
+        ! empty( $menu_obj->taxonomy ) &&
+        'nav_menu' == $menu_obj->taxonomy
+    ) 
         return true;
     
@@ -144 +149 @@
  * @param int $menu_id The ID of the menu
  * @param array $menu_data The array of menu data.
- * @return int The menu's ID.
+ * @return int|error object The menu's ID or WP_Error object.
  */
 function wp_update_nav_menu_object( $menu_id = 0, $menu_data = array() ) {
@@ -152 +157 @@
 
     // menu doesn't already exist
-    if ( ! $_menu || is_wp_error( $_menu ) ) {
+    if ( ! $_menu || is_wp_error( $_menu ) )
         $_menu = wp_create_nav_menu( $menu_data['menu-name'] );
-    }
-
-    if ( $_menu && isset( $_menu->term_id ) && ! is_wp_error( $_menu ) ) {
+
+    if ( is_wp_error( $_menu ) )
+        return $_menu;
+
+    if ( $_menu && isset( $_menu->term_id ) ) {
         $args = array( 
             'description' => ( isset( $menu_data['description'] ) ? $menu_data['description'] : '' ), 
@@ -168 +175 @@
         $update_response = wp_update_term( $menu_id, 'nav_menu', $args );
 
-        if ( ! is_wp_error( $update_response ) ) {
+        if ( ! is_wp_error( $update_response ) )
             return $menu_id;
-        }
+        else
+            return $update_response;
     } else {
         return 0;
@@ -238 +246 @@
     }
     
+    if ( 'custom' != $args['menu-item-type'] ) {
+        /* if non-custom menu item, then:
+            * use original object's URL
+            * blank default title to sync with original object's
+        */
+
+        $args['menu-item-url'] = '';
+
+        $original_title = '';
+        if ( 'taxonomy' == $args['menu-item-type'] ) {
+            $original_title = get_term_field( 'name', $args['menu-item-object-id'], $args['menu-item-object'], 'raw' );
+        } elseif ( 'post_type' == $args['menu-item-type'] ) {
+            $original_object = get_post( $args['menu-item-object-id'] );
+            $original_title = $original_object->post_title;
+        }
+
+        if ( empty( $args['menu-item-title'] ) || $args['menu-item-title'] == $original_title ) {
+            $args['menu-item-title'] = '';
+
+            // hack to get wp to create a post object when too many properties are empty
+            if ( empty( $args['menu-item-description'] ) ) {
+                $args['menu-item-description'] = ' ';
+            }
+        }
+    }
+
     // Populate the menu item object
     $post = array(
@@ -363 +397 @@
 
         $items = get_posts( $args );
+
+        if ( is_wp_error( $items ) || ! is_array( $items ) ) {
+            return false;
+        }
+
+        $items = array_map( 'wp_setup_nav_menu_item', $items );
 
         if ( ARRAY_A == $args['output'] ) {
@@ -411 +451 @@
                 $menu_item->append = $object->singular_label;
                 $menu_item->url = get_permalink( $menu_item->object_id );
+            
+                $original_object = get_post( $menu_item->object_id );
+                $original_title = $original_object->post_title;
+                $menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title;
 
             } elseif ( 'taxonomy' == $menu_item->type ) {
@@ -417 +461 @@
                 $menu_item->url = get_term_link( (int) $menu_item->object_id, $menu_item->object );
 
+                $original_title = get_term_field( 'name', $menu_item->object_id, $menu_item->object, 'raw' );
+                $menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title;
+
             } else {
                 $menu_item->append = __('Custom');
+                $menu_item->title = $menu_item->post_title;
                 $menu_item->url = get_post_meta( $menu_item->ID, '_menu_item_url', true );
             }
             
-            $menu_item->title = $menu_item->post_title;
             $menu_item->target = get_post_meta( $menu_item->ID, '_menu_item_target', true );