Ticket #32632: 32632.diff

src/wp-includes/nav-menu.php

@@ -658 +658 @@
         if ( isset( $menu_item->post_type ) ) {
                 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 ) {
                                 $object = get_post_type_object( $menu_item->object );
@@ -703 +703 @@
                         } else {
                                 $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;
 
                         /**
                          * Filter a navigation menu item's title attribute.
@@ -715 +715 @@
                          *
                          * @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;
+                        $menu_item->attr_title = ! isset( $menu_item->attr_title ) ? apply_filters( 'nav_menu_attr_title', $menu_item->post_excerpt ) : $menu_item->attr_title;
 
-                        if ( empty( $menu_item->description ) ) {
+                        if ( ! isset( $menu_item->description ) ) {
                                 /**
                                  * Filter a navigation menu item's description.
                                  *
@@ -728 +728 @@
                                 $menu_item->description = apply_filters( 'nav_menu_description', wp_trim_words( $menu_item->post_content, 200 ) );
                         }
 
-                        $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;
                         $menu_item->menu_item_parent = 0;

src/wp-includes/post.php

@@ -681 +681 @@
         /**
          * Constructor.
          *
-         * @param WP_Post $post Post object.
+         * @param WP_Post|object $post Post object.
          */
         public function __construct( $post ) {
                 foreach ( get_object_vars( $post ) as $key => $value )