Changeset 32762

Timestamp:

06/14/2015 10:52:35 AM (9 years ago)

Author:

ocean90

Message:

Nav Menus: Update wp_setup_nav_menu_item() to stop overriding empty properties from supplied $menu_item.

Update docs for WP_Post constructor to indicate that WP_Post|object can be the supplied param, as opposed to just WP_Post.

props westonruter.
fixes #32632.

Location:

trunk/src/wp-includes

Files:

• nav-menu.php (modified) (4 diffs)
• post.php (modified) (1 diff)

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

@@ -672 +672 @@
         if ( 'nav_menu_item' == $menu_item->post_type ) {
             $menu_item->db_id = (int) $menu_item->ID;
-            $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;
+            $menu_item->menu_item_parent = ! isset( $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 = ! isset( $menu_item->object_id ) ? get_post_meta( $menu_item->ID, '_menu_item_object_id', true ) : $menu_item->object_id;
+            $menu_item->object = ! isset( $menu_item->object ) ? get_post_meta( $menu_item->ID, '_menu_item_object', true ) : $menu_item->object;
+            $menu_item->type = ! isset( $menu_item->type ) ? get_post_meta( $menu_item->ID, '_menu_item_type', true ) : $menu_item->type;
 
             if ( 'post_type' == $menu_item->type ) {
@@ -717 +717 @@
                 $menu_item->type_label = __('Custom Link');
                 $menu_item->title = $menu_item->post_title;
-                $menu_item->url = empty( $menu_item->url ) ? get_post_meta( $menu_item->ID, '_menu_item_url', true ) : $menu_item->url;
+                $menu_item->url = ! isset( $menu_item->url ) ? get_post_meta( $menu_item->ID, '_menu_item_url', true ) : $menu_item->url;
             }
 
-            $menu_item->target = empty( $menu_item->target ) ? get_post_meta( $menu_item->ID, '_menu_item_target', true ) : $menu_item->target;
+            $menu_item->target = ! isset( $menu_item->target ) ? get_post_meta( $menu_item->ID, '_menu_item_target', true ) : $menu_item->target;
 
             /**
@@ -729 +729 @@
              * @param string $item_title The menu item title attribute.
              */
-            $menu_item->attr_title = empty( $menu_item->attr_title ) ? apply_filters( 'nav_menu_attr_title', $menu_item->post_excerpt ) : $menu_item->attr_title;
-
-            if ( empty( $menu_item->description ) ) {
+            $menu_item->attr_title = ! isset( $menu_item->attr_title ) ? apply_filters( 'nav_menu_attr_title', $menu_item->post_excerpt ) : $menu_item->attr_title;
+
+            if ( ! isset( $menu_item->description ) ) {
                 /**
                  * Filter a navigation menu item's description.
@@ -742 +742 @@
             }
 
-            $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;
+            $menu_item->classes = ! isset( $menu_item->classes ) ? (array) get_post_meta( $menu_item->ID, '_menu_item_classes', true ) : $menu_item->classes;
+            $menu_item->xfn = ! isset( $menu_item->xfn ) ? get_post_meta( $menu_item->ID, '_menu_item_xfn', true ) : $menu_item->xfn;
         } else {
             $menu_item->db_id = 0;

trunk/src/wp-includes/post.php

@@ -682 +682 @@
      * Constructor.
      *
-     * @param WP_Post $post Post object.
+     * @param WP_Post|object $post Post object.
      */
     public function __construct( $post ) {