* revert previous change, as it was wrong

 * properly fix the handling of pkg by moving it ahead of the user/usertag selection

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 7be6241c75335f679639fcf3db93ebd128ba40cc..a856a80981923beae5b7f51917ff8776603afe54 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -226,16 +226,15 @@ if (defined $param{maintenc}) {
      delete $param{maintenc}
 }
 
-
-if (not grep {exists $param{$_}} keys %package_search_keys and exists $param{users}) {
-     $param{usertag} = [make_list($param{users})];
-}
-
 if (exists $param{pkg}) {
      $param{package} = $param{pkg};
      delete $param{pkg};
 }
 
+if (not grep {exists $param{$_}} keys %package_search_keys and exists $param{users}) {
+     $param{usertag} = [make_list($param{users})];
+}
+
 my %bugusertags;
 my %ut;
 my %seen_users;
@@ -246,7 +245,6 @@ for my $user (map {split /[\s*,\s*]+/} make_list($param{users}||[])) {
 }
 
 if (defined $param{usertag}) {
-    my $do_not_add_usertags = grep {exists $param{$_}} keys %package_search_keys;
      for my $usertag (make_list($param{usertag})) {
          my %select_ut = ();
          my ($u, $t) = split /:/, $usertag, 2;
@@ -255,7 +253,7 @@ if (defined $param{usertag}) {
               $t = join(",", keys(%select_ut));
          }
          add_user($u,\%ut,\%bugusertags,\%seen_users,\%cats,\%hidden);
-         push @{$param{tag}}, split /,/, $t unless $do_not_add_usertags;
+         push @{$param{tag}}, split /,/, $t;
      }
 }