Bug 461729: [PostgreSQL] Incorrect SQL is generated when searching for keywords with...

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 4b21b216b8e6f85197dc0c76e01923bb3a410076..557af66468d56702aaf7bfc1a08caccd1532c48e 100644 (file)
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -879,12 +879,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));
         }
     }