* Finish deprecating quit in Debbugs::Status

[debbugs.git] / cgi / pkgreport.cgi

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index c61bc01a7604ee601e2d454500d610e0a8dace0d..8736e8c0570a1305c91193d167adf9ba857104d5 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -654,16 +654,15 @@ sub pkg_htmlindexentrystatus {
         $showversions .= join ', ', map {s{/}{ }; html_escape($_)} @fixed;
     }
     $result .= ' (<a href="'.
-        version_url($status{package},
-                    $status{found_versions},
-                    $status{fixed_versions},
+        version_url(package => $status{package},
+                    found   => $status{found_versions},
+                    fixed   => $status{fixed_versions},
                    ).qq{">$showversions</a>)} if length $showversions;
     $result .= ";\n";
 
     $result .= $showseverity;
-    $result .= pkg_htmladdresslinks("Reported by: ", \&submitterurl,
-                                $status{originator});
-    $result .= ";\nOwned by: " . html_escape($status{owner})
+    $result .= "Reported by: ".package_links(submitter=>$status{originator});
+    $result .= ";\nOwned by: " . package_links(owner => $status{owner})
                if length $status{owner};
     $result .= ";\nTags: <strong>" 
                  . html_escape(join(", ", sort(split(/\s+/, $status{tags}))))
@@ -904,10 +903,6 @@ sub pkg_htmlpackagelinks {
            );
 }
 
-sub pkg_htmladdresslinks {
-     htmlize_addresslinks(@_,'submitter');
-}
-
 sub pkg_javascript {
     return <<EOF ;
 <script type="text/javascript">
@@ -1030,7 +1025,7 @@ sub pkg_htmlselectarch {
 sub myurl {
      return html_escape(pkg_url(map {exists $param{$_}?($_,$param{$_}):()}
                             qw(archive repeatmerged mindays maxdays),
-                            qw(version dist arch pkg src tag maint submitter)
+                            qw(version dist arch package src tag maint submitter)
                            )
                    );
 }