From 5fd2feb54c38fc6f357026aadd8abfd224631c26 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Thu, 22 Feb 2007 14:24:41 +0000
Subject: WP Merge to 4914

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@896 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-includes/query.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'wp-includes/query.php')

diff --git a/wp-includes/query.php b/wp-includes/query.php
index 01a28a9..b93b5bb 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -765,9 +765,11 @@ class WP_Query {
 				$searchand = ' AND ';
 			}
 			$term = addslashes_gpc($q['s']); 
-			if (!$q['sentence'] && count($q['search_terms']) > 1 && $q['search_terms'][0] != $q['s'] ) $search .= " OR (post_title LIKE '{$n}{$term}{$n}') OR (post_content LIKE '{$n}{$term}{$n}')";
-			
-			$search = " AND ({$search}) ";
+			if (!$q['sentence'] && count($q['search_terms']) > 1 && $q['search_terms'][0] != $q['s'] )
+				$search .= " OR (post_title LIKE '{$n}{$term}{$n}') OR (post_content LIKE '{$n}{$term}{$n}')";
+
+			if ( !empty($search) )
+				$search = " AND ({$search}) ";
 		}
 
 		// Category stuff
-- 
cgit