Prevent admin breakage for s in WP_Query after [28623].

See #11330.


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


git-svn-id: http://core.svn.wordpress.org/trunk@28484 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-06-04 20:03:15 +00:00
parent 38819880ec
commit 1aaa80f48e

View File

@ -1512,7 +1512,7 @@ class WP_Query {
} else { } else {
// Look for archive queries. Dates, categories, authors, search, post type archives. // Look for archive queries. Dates, categories, authors, search, post type archives.
if ( isset( $this->query['s'] ) ) { if ( ! is_admin() & isset( $this->query['s'] ) ) {
$this->is_search = true; $this->is_search = true;
} }
@ -2483,7 +2483,7 @@ class WP_Query {
if ( ! empty( $q['s'] ) ) { if ( ! empty( $q['s'] ) ) {
$search = $this->parse_search( $q ); $search = $this->parse_search( $q );
} elseif ( $this->is_search ) { } elseif ( $this->is_search ) {
$search = 'AND 0'; $search = ' AND 0';
} }
/** /**