From f424977028dec0a316cd0d1fc406387e02fda5a9 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Mon, 3 Oct 2016 02:35:28 +0000
Subject: [PATCH] Menus: Restore checkboxes in post type search which were lost
 in [38584].

The `$args` variable was being overridden instead of extended, therefore causing the `walker` to be dropped.

Fixes #33742.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38645 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/nav-menu.php | 17 ++++++++++-------
 wp-includes/version.php        |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php
index b1c6f647f2..3da92d3a48 100644
--- a/wp-admin/includes/nav-menu.php
+++ b/wp-admin/includes/nav-menu.php
@@ -71,13 +71,16 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
 	} elseif ( preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches) ) {
 		if ( 'posttype' == $matches[1] && get_post_type_object( $matches[2] ) ) {
 			$post_type_obj = _wp_nav_menu_meta_box_object( get_post_type_object( $matches[2] ) );
-			$args = array(
-				'no_found_rows'          => true,
-				'update_post_meta_cache' => false,
-				'update_post_term_cache' => false,
-				'posts_per_page'         => 10,
-				'post_type'              => $matches[2],
-				's'                      => $query,
+			$args = array_merge(
+				$args,
+				array(
+					'no_found_rows'          => true,
+					'update_post_meta_cache' => false,
+					'update_post_term_cache' => false,
+					'posts_per_page'         => 10,
+					'post_type'              => $matches[2],
+					's'                      => $query,
+				)
 			);
 			if ( isset( $post_type_obj->_default_query ) ) {
 				$args = array_merge( $args, (array) $post_type_obj->_default_query );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 59f053920d..d0ed82417b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38701';
+$wp_version = '4.7-alpha-38702';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.