Changeset 38584 for trunk/src/wp-admin/includes/nav-menu.php

Timestamp:

09/09/2016 04:59:01 AM (8 years ago)

Author:

westonruter

Message:

Menus: Prevent non-published posts/pages from being returned in search results for adding as nav menu items.

Re-use the same query vars in searching as when listing posts. Aligns with behavior of nav menus in customizer.

Fixes #33742.
Props welcher, westonruter.

File:

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

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

@@ -71 +71 @@
     } elseif ( preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches) ) {
         if ( 'posttype' == $matches[1] && get_post_type_object( $matches[2] ) ) {
-            $search_results_query = new WP_Query( array(
+            $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,
@@ -78 +79 @@
                 'post_type'              => $matches[2],
                 's'                      => $query,
-            ) );
+            );
+            if ( isset( $post_type_obj->_default_query ) ) {
+                $args = array_merge( $args, (array) $post_type_obj->_default_query );
+            }
+            $search_results_query = new WP_Query( $args );
             if ( ! $search_results_query->have_posts() ) {
                 return;