From: lpsolit%gmail.com <>
Date: Wed, 29 Oct 2008 05:30:26 +0000 (+0000)
Subject: Bug 461729: [PostgreSQL] Incorrect SQL is generated when searching for keywords with... 
X-Git-Tag: bugzilla-3.0.6~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3e86f279550a74627c8a876aa19b036a95b98a9;p=thirdparty%2Fbugzilla.git

Bug 461729: [PostgreSQL] Incorrect SQL is generated when searching for keywords with dashes in them - Patch by Frédéric Buclin <LpSolit@gmail.com> r/a=mkanat
---

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 2673efaa91..ca12ad3d09 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -1622,12 +1622,9 @@ sub GetByWordList {
         my $word = $w;
         if ($word ne "") {
             $word =~ tr/A-Z/a-z/;
-            $word = $dbh->quote(quotemeta($word));
+            $word = $dbh->quote('(^|[^a-z0-9])' . quotemeta($word) . '($|[^a-z0-9])');
             trick_taint($word);
-            $word =~ s/^'//;
-            $word =~ s/'$//;
-            $word = '(^|[^a-z0-9])' . $word . '($|[^a-z0-9])';
-            push(@list, $dbh->sql_regexp($field, "'$word'"));
+            push(@list, $dbh->sql_regexp($field, $word));
         }
     }