Bug 282025: Queries with group pronouns should accept non-word characters in group...

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index e8da89204f080c59becf890c269a977d4e0df9fc..bdf764f368ad5d6fa235dee7f180e7945c09a64a 100644 (file)
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -409,7 +409,7 @@ sub init {
     my %funcsbykey;
     my @funcdefs =
         (
-         "^(?:assigned_to|reporter|qa_contact),(?:notequals|equals|anyexact),%group\\.(\\w+)%" => sub {
+         "^(?:assigned_to|reporter|qa_contact),(?:notequals|equals|anyexact),%group\\.([^%]+)%" => sub {
              my $group = $1;
              my $groupid = Bugzilla::Group::ValidateGroupName( $group, ($user));
              $groupid || ThrowUserError('invalid_group_name',{name => $group});
@@ -451,7 +451,7 @@ sub init {
              $f = "COALESCE(map_$f.login_name,'')";
          },
 
-         "^(?:cc),(?:notequals|equals|anyexact),%group\\.(\\w+)%" => sub {
+         "^(?:cc),(?:notequals|equals|anyexact),%group\\.([^%]+)%" => sub {
              my $group = $1;
              my $groupid = Bugzilla::Group::ValidateGroupName( $group, ($user));
              $groupid || ThrowUserError('invalid_group_name',{name => $group});