r1374: Merging r1371/1373 back to the trunk to fix a potential SQL error on search...

diff --git a/docs/changes.txt b/docs/changes.txt
index c7da44a7a95fe99ea372d5e760882a739584ba87..d9077bd0bc25286f9434ab506c709d80a0b37432 100644 (file)
--- 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 ee6f2640fe992446d8edb63f88c19ff6ba770e84..f73d3a8e8d43666bc8eabad8e551db3b0608b2af 100644 (file)
--- 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();