Bug 256513: Fix usage of grep (/$value/, @array);

Patch By Olav Vitters <bugzilla-mozilla@bkor.dhs.org> (Backported by mkanat) r=justdave, a=justdave

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index cddd33ba47ffd6d5dac71dbc6cf76ef3ded9d150..a25e95f1ef48ce5b0b39183daca9228e890b7640 100644 (file)
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -91,7 +91,7 @@ sub getTemplateIncludePath () {
         # 'en-uk' etc. but not the otherway round. (This is unfortunally
         # not very clearly stated in those RFC; see comment just over 14.5
         # in http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4)
-        if(my @found = grep /^$lang(-.+)?$/i, @languages) {
+        if(my @found = grep /^\Q$lang\E(-.+)?$/i, @languages) {
             push (@usedlanguages, @found);
         }
     }

diff --git a/checksetup.pl b/checksetup.pl
index 8cc173b1fb5c3fd419174abed6ccc666d1e64b80..74b718c36b2bd7876d2086c982dd627eaf844b1f 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -807,7 +807,7 @@ if ($my_webservergroup && !$silent) {
         # that we can't chgrp to
         my $webservergid = (getgrnam($my_webservergroup))[2]
                            or die("no such group: $my_webservergroup");
-        if ($< != 0 && !grep(/^$webservergid$/, split(" ", $)))) {
+        if ($< != 0 && !grep($_ eq $webservergid, split(" ", $)))) {
             print <<EOF;
 
 Warning: you have entered a value for the "webservergroup" parameter in 
@@ -1483,7 +1483,7 @@ if ($my_db_check) {
     }
 
     my @databases = $dbh->func('_ListDBs');
-    unless (grep /^$my_db_name$/, @databases) {
+    unless (grep($_ eq $my_db_name, @databases)) {
        print "Creating database $my_db_name ...\n";
        if (!$dbh->func('createdb', $my_db_name, 'admin')) {
             my $error = $dbh->errstr;
@@ -2054,7 +2054,7 @@ my $my_platforms  = '"' . join('", "', @my_platforms)  . '"';
 
 # go throught our %table hash and create missing tables
 while (my ($tabname, $fielddef) = each %table) {
-    next if grep /^$tabname$/, @tables;
+    next if grep($_ eq $tabname, @tables);
     print "Creating table $tabname ...\n";
 
     # add lines here if you add more --LOCAL-- config vars that end up in

diff --git a/importxml.pl b/importxml.pl
index 277681a35e003a09ca73a5029e0529dc560fbbd9..f0208448bdab8bedf6f9517850eb9fbc2fc98d57 100755 (executable)
--- a/importxml.pl
+++ b/importxml.pl
@@ -412,8 +412,8 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
   }
 
   if (defined  ($::versions{$product[0]} ) &&
-     (my @version = grep /^$bug_fields{'version'}$/i, 
-                         @{$::versions{$product[0]}}) ){
+     (my @version = grep(lc($_) eq lc($bug_fields{'version'}), 
+                         @{$::versions{$product[0]}})) ){
     push (@values, SqlQuote($version[0]) );
     push (@query, "version");
   } else {
@@ -424,7 +424,7 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
   }
 
   if (defined ($bug_fields{'priority'}) &&
-       (my @priority = grep /^$bug_fields{'priority'}$/i, @::legal_priority) ){
+       (my @priority = grep(lc($_) eq lc($bug_fields{'priority'}), @::legal_priority)) ){
     push (@values, SqlQuote($priority[0]) );
     push (@query, "priority");
   } else {
@@ -436,7 +436,7 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
   }
 
   if (defined ($bug_fields{'rep_platform'}) &&
-       (my @platform = grep /^$bug_fields{'rep_platform'}$/i, @::legal_platform) ){
+       (my @platform = grep(lc($_) eq lc($bug_fields{'rep_platform'}), @::legal_platform)) ){
     push (@values, SqlQuote($platform[0]) );
     push (@query, "rep_platform");
   } else {
@@ -449,7 +449,7 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
   }
 
   if (defined ($bug_fields{'op_sys'}) &&
-     (my @opsys = grep /^$bug_fields{'op_sys'}$/i, @::legal_opsys) ){
+     (my @opsys = grep(lc($_) eq lc($bug_fields{'op_sys'}), @::legal_opsys)) ){
     push (@values, SqlQuote($opsys[0]) );
     push (@query, "op_sys");
   } else {
@@ -462,8 +462,8 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
 
   if (Param("usetargetmilestone")) {
     if (defined  ($::target_milestone{$product[0]} ) &&
-       (my @tm = grep /^$bug_fields{'target_milestone'}$/i, 
-                       @{$::target_milestone{$product[0]}}) ){
+       (my @tm = grep(lc($_) eq lc($bug_fields{'target_milestone'}), 
+                       @{$::target_milestone{$product[0]}})) ){
       push (@values, SqlQuote($tm[0]) );
       push (@query, "target_milestone");
     } else {
@@ -482,8 +482,8 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
   }
 
   if (defined ($bug_fields{'bug_severity'}) &&
-       (my @severity= grep /^$bug_fields{'bug_severity'}$/i, 
-                           @::legal_severity) ){
+       (my @severity= grep(lc($_) eq lc($bug_fields{'bug_severity'}), 
+                           @::legal_severity)) ){
     push (@values, SqlQuote($severity[0]) );
     push (@query, "bug_severity");
   } else {
@@ -533,7 +533,7 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
 
   my @resolution;
   if (defined ($bug_fields{'resolution'}) &&
-       (@resolution= grep /^$bug_fields{'resolution'}$/i, @::legal_resolution) ){
+       (@resolution= grep(lc($_) eq lc($bug_fields{'resolution'}), @::legal_resolution)) ){
     push (@values, SqlQuote($resolution[0]) );
     push (@query, "resolution");
   } elsif ( (defined $bug_fields{'resolution'}) && (!$resolution[0]) ){
@@ -561,7 +561,7 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
                      $bug_fields{'bug_status'}:"unknown";
     $err .= "\".\n";
   } elsif (defined ($bug_fields{'bug_status'}) &&
-       (my @status = grep /^$bug_fields{'bug_status'}$/i, @::legal_bug_status) ){
+       (my @status = grep(lc($_) eq lc($bug_fields{'bug_status'}), @::legal_bug_status)) ){
     #if a bug status was set then use it, if its legal
     push (@values, SqlQuote($status[0]));
     push (@query, "bug_status");