From 2bfd821b9baad0751d0eb0156b90e60d0ba25f38 Mon Sep 17 00:00:00 2001
From: scribu <scribu@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 2 Oct 2010 22:52:15 +0000
Subject: [PATCH] Allow search in archive pages. Fixes #14831

git-svn-id: http://svn.automattic.com/wordpress/trunk@15687 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/query.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/wp-includes/query.php b/wp-includes/query.php
index 689e7010a4..c3bc48925d 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -1247,10 +1247,12 @@ class WP_Query {
 		} elseif ( '' != $qv['static'] || '' != $qv['pagename'] || !empty($qv['page_id']) ) {
 			$this->is_page = true;
 			$this->is_single = false;
-		} elseif ( !empty($qv['s']) ) {
-			$this->is_search = true;
 		} else {
-		// Look for archive queries.  Dates, categories, authors.
+		// Look for archive queries.  Dates, categories, authors, search.
+
+			if ( !empty($qv['s']) ) {
+				$this->is_search = true;
+			}
 
 			if ( '' !== $qv['second'] ) {
 				$this->is_time = true;