From: Don Armstrong <don@donarmstrong.com>
Date: Sun, 11 Jan 2009 06:46:21 +0000 (-0800)
Subject:  * only add usertags when there are no other selection methods active
X-Git-Tag: release/2.6.0~461^2~70
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=74d2d546cbabdd3576b210cbd7c2f9a7d73a6226;p=debbugs.git

 * only add usertags when there are no other selection methods active
---

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index f8eb6a44..7be6241c 100755
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -246,6 +246,7 @@ 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;
@@ -254,7 +255,7 @@ if (defined $param{usertag}) {
 	       $t = join(",", keys(%select_ut));
 	  }
 	  add_user($u,\%ut,\%bugusertags,\%seen_users,\%cats,\%hidden);
-	  push @{$param{tag}}, split /,/, $t;
+	  push @{$param{tag}}, split /,/, $t unless $do_not_add_usertags;
      }
 }