X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FCGI.pm;h=3632f3f869b585665a896a108b88cab25f4fa8b3;hb=eb9aa285dae3b6c3bbe95c03dbcc6256cc9cdc92;hp=53f0b5d27487de0018dacc1f7ec4aaa1015e2ec3;hpb=8e2acb41bf8ef68f94fb95878f201296465c82b4;p=debbugs.git

diff --git a/Debbugs/CGI.pm b/Debbugs/CGI.pm
index 53f0b5d..3632f3f 100644
--- a/Debbugs/CGI.pm
+++ b/Debbugs/CGI.pm
@@ -161,7 +161,9 @@ sub munge_url {
      while (my ($key,$value) = splice @old_param,0,2) {
 	  push @new_param,($key,$value) unless exists $params{$key};
      }
-     $new_url->query_form(@new_param,%params);
+     $new_url->query_form(@new_param,
+			  map {($_,$params{$_})}
+			  sort keys %params);
      return $new_url->as_string;
 }
 
@@ -400,11 +402,15 @@ sub package_links {
      }
      my @links = ();
      for my $type (qw(src package)) {
-	  push @links, map {(munge_url('pkgreport.cgi?',
+	  push @links, map {my $t_type = $type;
+			    if ($_ =~ s/^src://) {
+				$t_type = 'src';
+			    }
+			    (munge_url('pkgreport.cgi?',
 				       %options,
-				       $type => $_,
+				       $t_type => $_,
 				      ),
-			     ($type eq 'src'?'src:':'').$_);
+			     ($t_type eq 'src'?'src:':'').$_);
 		       } make_list($param{$type}) if exists $param{$type};
      }
      for my $type (qw(maint owner submitter correspondent)) {