Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-01 21:21:24 +01:00
Code Issues Projects Releases Wiki Activity

Nav Menus: Use WP_Query for quick searches.

Browse Source 
`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.
Built from https://develop.svn.wordpress.org/trunk@37881


git-svn-id: http://core.svn.wordpress.org/trunk@37822 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2016-06-27 11:51:30 +00:00
parent 04117fc392
commit f5bf3676b1
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
wp-admin/includes/nav-menu.php
View File

@ -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) ) {
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],
)
);
echo "\n";

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.6-alpha-37880';
$wp_version = '4.6-alpha-37881';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.