Bug 315339: User::match_field() now leaves fields undefined instead of as empty strin...

diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index 701c1c2b229f00001a2c6b1780005d1582db4130..88a7f0e491ad9e79165a16e10984a0d7033f3535 100644 (file)
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -952,9 +952,13 @@ sub match_field {
         my $raw_field = join(" ", $cgi->param($field));
 
         # When we add back in values later, it matters that we delete
-        # the param here, and not set it to '', so that we will add
+        # the field here, and not set it to '', so that we will add
         # things to an empty list, and not to a list containing one
-        # empty string
+        # empty string.
+        # If no match or more than one match is found for this field,
+        # we will set it back to '' so that the field remains defined
+        # outside this function (it was if we came here; else we would
+        # have returned ealier above).
         $cgi->delete($field);
 
         my @queries = ();
@@ -1039,6 +1043,11 @@ sub match_field {
                 $need_confirm = 1;  # confirmation screen shows failures
             }
         }
+        # Above, we deleted the field before adding matches. If no match
+        # or more than one match has been found, we set it back to '' so
+        # that the caller of this function can still check whether this
+        # field was defined or not (and it was if we came here).
+        $cgi->param($field, '') unless defined $cgi->param($field);
     }
 
     my $retval;