From cd4fecb0ee46ec2ad65b71413eaebf25ce967eec Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 15 Oct 2010 02:36:47 +0000
Subject: [PATCH] BUGFIX: fix query error when image search doesn't use legacy
 search (from r106183)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112491 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ThumbnailStripField.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/ThumbnailStripField.php b/code/ThumbnailStripField.php
index 959bc3aa..f1282d8a 100755
--- a/code/ThumbnailStripField.php
+++ b/code/ThumbnailStripField.php
@@ -84,11 +84,13 @@ class ThumbnailStripField extends FormField {
 			
 		} else {
 			if (!self::$use_legacy_image_search) {
-			    $whereSQL = "\"ParentID\" = 0 AND ";
+			    $whereSQL = "\"ParentID\" = 0";
 			} else {
 			    $whereSQL = '';
 			}
+			
 			if($searchText) {
+				if (!empty($whereSQL)) $whereSQL .= " AND";
 				$whereSQL .= " \"Filename\" LIKE '%$searchText%'";
 			}