merge changes from mainline

[debbugs.git] / cgi / pkgreport.cgi

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 30284baa66ac2d0d8cd5406230ce98399c342486..c89ded45271e49acf893be0486d1d8169abdf21d 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -942,12 +942,13 @@ sub pkg_htmlselectarch {
 }
 
 sub myurl {
-    return pkg_etc_url($pkg, "pkg", 0) if defined($pkg);
-    return pkg_etc_url($src, "src", 0) if defined($src);
-    return pkg_etc_url($maint, "maint", 0) if defined($maint);
-    return pkg_etc_url($submitter, "submitter", 0) if defined($submitter);
-    return pkg_etc_url($severity, "severity", 0) if defined($severity);
-    return pkg_etc_url($tag, "tag", 0) if defined($tag);
+     return urlsanit('pkgreport.cgi?'.
+                    join(';',
+                         (map {("$_=$param{$_}")
+                                           } keys %param
+                         )
+                        )
+                   );
 }
 
 sub make_order_list {