From 154e3d4593a44bf601d30b259e066142111b86d2 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Wed, 4 Nov 2015 07:29:25 +0000
Subject: [PATCH] Customize: Simplify condition for returning
 `nav_menus_invalid_post_type` error.

Props swissspidy.
See #16075.

Built from https://develop.svn.wordpress.org/trunk@35501


git-svn-id: http://core.svn.wordpress.org/trunk@35465 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-customize-nav-menus.php | 5 ++---
 wp-includes/version.php                      | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/wp-includes/class-wp-customize-nav-menus.php b/wp-includes/class-wp-customize-nav-menus.php
index 6f5944f59c..ddc01fd89c 100644
--- a/wp-includes/class-wp-customize-nav-menus.php
+++ b/wp-includes/class-wp-customize-nav-menus.php
@@ -107,10 +107,9 @@ final class WP_Customize_Nav_Menus {
 		$items = array();
 
 		if ( 'post_type' === $type ) {
-			if ( ! get_post_type_object( $object ) ) {
+			$post_type = get_post_type_object( $object );
+			if ( ! $post_type ) {
 				return new WP_Error( 'nav_menus_invalid_post_type' );
-			} else {
-				$post_type = get_post_type_object( $object );
 			}
 
 			if ( 0 === $page && 'page' === $object ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 09964c0c85..a37a349f7f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-beta2-35500';
+$wp_version = '4.4-beta2-35501';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.