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. git-svn-id: https://develop.svn.wordpress.org/trunk@37881 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
2705524260
commit
f147b02783
|
@ -70,24 +70,28 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
|
||||||
|
|
||||||
} elseif ( preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches) ) {
|
} elseif ( preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches) ) {
|
||||||
if ( 'posttype' == $matches[1] && get_post_type_object( $matches[2] ) ) {
|
if ( 'posttype' == $matches[1] && get_post_type_object( $matches[2] ) ) {
|
||||||
query_posts(array(
|
$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,
|
'posts_per_page' => 10,
|
||||||
'post_type' => $matches[2],
|
'post_type' => $matches[2],
|
||||||
's' => $query,
|
's' => $query,
|
||||||
) );
|
) );
|
||||||
if ( ! have_posts() )
|
if ( ! $search_results_query->have_posts() ) {
|
||||||
return;
|
return;
|
||||||
while ( have_posts() ) {
|
}
|
||||||
the_post();
|
while ( $search_results_query->have_posts() ) {
|
||||||
|
$post = $search_results_query->next_post();
|
||||||
if ( 'markup' == $response_format ) {
|
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 );
|
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 ) {
|
} elseif ( 'json' == $response_format ) {
|
||||||
echo wp_json_encode(
|
echo wp_json_encode(
|
||||||
array(
|
array(
|
||||||
'ID' => get_the_ID(),
|
'ID' => $post->ID,
|
||||||
'post_title' => get_the_title(),
|
'post_title' => get_the_title( $post->ID ),
|
||||||
'post_type' => get_post_type(),
|
'post_type' => $matches[2],
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
echo "\n";
|
echo "\n";
|
||||||
|
|
|
@ -0,0 +1,29 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @group menu
|
||||||
|
*/
|
||||||
|
class Tests_Menu_WpAjaxMenuQuickSeach extends WP_UnitTestCase {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @ticket 27042
|
||||||
|
*/
|
||||||
|
public function test_search_returns_results_for_pages() {
|
||||||
|
include_once ABSPATH . 'wp-admin/includes/nav-menu.php';
|
||||||
|
|
||||||
|
self::factory()->post->create_many( 3, array( 'post_type' => 'page', 'post_content' => 'foo' ) );
|
||||||
|
self::factory()->post->create( array( 'post_type' => 'page', 'post_content' => 'bar' ) );
|
||||||
|
|
||||||
|
$request = array(
|
||||||
|
'type' => 'quick-search-posttype-page',
|
||||||
|
'q' => 'foo',
|
||||||
|
'response-format' => 'json',
|
||||||
|
);
|
||||||
|
|
||||||
|
$output = get_echo( '_wp_ajax_menu_quick_search', array( $request ) );
|
||||||
|
$this->assertNotEmpty( $output );
|
||||||
|
|
||||||
|
$results = explode( "\n", trim( $output ) );
|
||||||
|
$this->assertCount( 3, $results );
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue