From 74d2d546cbabdd3576b210cbd7c2f9a7d73a6226 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Sat, 10 Jan 2009 22:46:21 -0800 Subject: [PATCH] * only add usertags when there are no other selection methods active --- cgi/pkgreport.cgi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi index f8eb6a4..7be6241 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; } } -- 2.39.2