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

Timestamp:

05/27/2010 02:24:33 AM (16 years ago)

Author:

nacin

Message:

Move the "Add Home Link" functionality to a checkbox on the View All tab of the Pages metabox. Also makes it work non-JS. props filosofo, fixes #13213.

File:

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

trunk/wp-includes/nav-menu.php

@@ -546 +546 @@
                 if ( 'nav_menu_item' == $menu_item->post_type ) {
                         $menu_item->db_id = (int) $menu_item->ID;
-                        $menu_item->menu_item_parent = get_post_meta( $menu_item->ID, '_menu_item_menu_item_parent', true );
-                        $menu_item->object_id = get_post_meta( $menu_item->ID, '_menu_item_object_id', true );
-                        $menu_item->object = get_post_meta( $menu_item->ID, '_menu_item_object', true );
-                        $menu_item->type = get_post_meta( $menu_item->ID, '_menu_item_type', true );
+                        $menu_item->menu_item_parent = empty( $menu_item->menu_item_parent ) ? get_post_meta( $menu_item->ID, '_menu_item_menu_item_parent', true ) : $menu_item->menu_item_parent;
+                        $menu_item->object_id = empty( $menu_item->object_id ) ? get_post_meta( $menu_item->ID, '_menu_item_object_id', true ) : $menu_item->object_id;
+                        $menu_item->object = empty( $menu_item->object ) ? get_post_meta( $menu_item->ID, '_menu_item_object', true ) : $menu_item->object;
+                        $menu_item->type = empty( $menu_item->type ) ? get_post_meta( $menu_item->ID, '_menu_item_type', true ) : $menu_item->type;
 
                         if ( 'post_type' == $menu_item->type ) {
@@ -572 +572 @@
                                 $menu_item->type_label = __('Custom');
                                 $menu_item->title = $menu_item->post_title;
-                                $menu_item->url = get_post_meta( $menu_item->ID, '_menu_item_url', true );
+                                $menu_item->url = empty( $menu_item->url ) ? get_post_meta( $menu_item->ID, '_menu_item_url', true ) : $menu_item->url;
                         }
 
-                        $menu_item->target = get_post_meta( $menu_item->ID, '_menu_item_target', true );
-
-                        $menu_item->attr_title = apply_filters( 'nav_menu_attr_title', $menu_item->post_excerpt );
-                        $menu_item->description = apply_filters( 'nav_menu_description', $menu_item->post_content );
-
-                        $menu_item->classes = (array) get_post_meta( $menu_item->ID, '_menu_item_classes', true );
-                        $menu_item->xfn = get_post_meta( $menu_item->ID, '_menu_item_xfn', true );
+                        $menu_item->target = empty( $menu_item->target ) ? get_post_meta( $menu_item->ID, '_menu_item_target', true ) : $menu_item->target;
+
+                        $menu_item->attr_title = empty( $menu_item->attr_title ) ? apply_filters( 'nav_menu_attr_title', $menu_item->post_excerpt ) : $menu_item->attr_title;
+                        $menu_item->description = empty( $menu_item->description ) ? apply_filters( 'nav_menu_description', $menu_item->post_content ) : $menu_item->description;
+
+                        $menu_item->classes = empty( $menu_item->classes ) ? (array) get_post_meta( $menu_item->ID, '_menu_item_classes', true ) : $menu_item->classes;
+                        $menu_item->xfn = empty( $menu_item->xfn ) ? get_post_meta( $menu_item->ID, '_menu_item_xfn', true ) : $menu_item->xfn;
                 } else {
                         $menu_item->db_id = 0;