From 04f4fae1ab5563d2bf8b5acc8c672c2910881abc Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Fri, 29 Dec 2006 21:03:20 +0000
Subject: [PATCH] r1374: Merging r1371/1373 back to the trunk to fix a
 potential SQL error on search.php (bug://report/62)

---
 docs/changes.txt | 5 +++++
 search.php       | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/docs/changes.txt b/docs/changes.txt
index c7da44a..d9077bd 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -11,6 +11,11 @@
 - Versions can be marked "Obsolete" so new bugs cannot be filed against them
 - When there are no bugs to display on index.php, don't show an empty grid, but rather an error message
 
+1.1.5
+===============================
+
+- Fixed a potential SQL error on search.php because no results were found (bug://report/62)
+
 1.1.4
 ===============================
 - Time zones with half-hours are not saved because the field only allows INTs (http://www.bluestatic.org/bugs/showreport.php?bugid=38)
diff --git a/search.php b/search.php
index ee6f264..f73d3a8 100644
--- a/search.php
+++ b/search.php
@@ -536,6 +536,11 @@ if ($_POST['do'] == 'results')
 		$hilight = $search['hilight'];
 	}
 	
+	if (!$search['ids'])
+	{
+		$message->error(_('No bugs matched your search criteria. Please <a href="search.php?new=1">try again</a> with different search requirements.'));
+	}
+	
 	LoadPaginationFramework();
 	$pagination->setTotal($search['resultcount']);
 	$pagination->splitPages();
-- 
2.22.5