Changeset 37881

Timestamp:

06/27/2016 11:50:31 AM (9 years ago)

Author:

ocean90

Message:

Nav Menus: Use WP_Query for quick searches.

the_post() sets the $in_the_loop property to true which is unexpected in the admin if you're using filters which should only affect real loops.

Props ruud@joyo.
Fixes #27042.

Location:

trunk

Files:

• src/wp-admin/includes/nav-menu.php (modified) (1 diff)
• tests/phpunit/tests/menu/wpAjaxMenuQuickSearch.php (added)

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] ) ) {
-            query_posts(array(
-                'posts_per_page' => 10,
-                'post_type' => $matches[2],
-                's' => $query,
-            ));
-            if ( ! have_posts() )
+            $search_results_query = new WP_Query( 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 ( ! $search_results_query->have_posts() ) {
                 return;
-            while ( have_posts() ) {
-                the_post();
+            }
+            while ( $search_results_query->have_posts() ) {
+                $post = $search_results_query->next_post();
                 if ( 'markup' == $response_format ) {
-                    $var_by_ref = get_the_ID();
+                    $var_by_ref = $post->ID;
                     echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $var_by_ref ) ) ), 0, (object) $args );
                 } elseif ( 'json' == $response_format ) {
                     echo wp_json_encode(
                         array(
-                            'ID' => get_the_ID(),
-                            'post_title' => get_the_title(),
-                            'post_type' => get_post_type(),
+                            'ID' => $post->ID,
+                            'post_title' => get_the_title( $post->ID ),
+                            'post_type' => $matches[2],
                         )
                     );