Changeset 28668

Timestamp:

06/04/2014 11:46:39 PM (10 years ago)

Author:

SergeyBiryukov

Message:

Move is_admin check to a more appropriate place.

see #11330.

File:

• trunk/src/wp-includes/query.php (modified) (2 diffs)

trunk/src/wp-includes/query.php

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