* Use our $bug_order for mod_perl issues

 * Fix bug_log return and newest_bug method in Debbugs::SOAP

diff --git a/Debbugs/SOAP.pm b/Debbugs/SOAP.pm
index f9a44566467622e8af576c87d2641f3d7e495049..590a2f673ca15a5438388d8ef72e87e2362e55a7 100644 (file)
--- a/Debbugs/SOAP.pm
+++ b/Debbugs/SOAP.pm
@@ -151,7 +151,7 @@ sub newest_bugs{
      my $VERSION = __populate_version(pop);
      my ($self,$num) = @_;
      my $newest_bug = Debbugs::bugs::newest_bug();
-     @bugs = ($newest_bug - $num + 1) .. $newest_bug;
+     return [$newest_bug - $num + 1) .. $newest_bug];
 }
 
 
@@ -208,9 +208,8 @@ sub get_bug_log{
          next if defined $msg_id and $msg_id =~ /handler\..+\.ack(?:info)?\@/;
          my $message = parse($record->{text});
          my ($header,$body) = map {join("\n",make_list($_))}
-              values %{$message};
-         push @messages,{html => $record->{html},
-                         header => $header,
+              @{$message}{qw(header body)};
+         push @messages,{header => $header,
                          body   => $body,
                          attachments => [],
                          msg_num => $current_msg,

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index e3b3d4be7fd9a80baaae5fb318cd54f5b536234b..731b4154ebef6269137e6dac9e6fb3c19ef1801a 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -85,7 +85,7 @@ unless (defined $ordering) {
    $ordering = "raw" if $raw_sort;
    $ordering = 'age' if $age_sort;
 }
-my ($bug_order) = $ordering =~ /(age(?:rev)?)/;
+our ($bug_order) = $ordering =~ /(age(?:rev)?)/;
 $bug_order = '' if not defined $bug_order;
 
 my $bug_rev = ($param{'bug-rev'} || "no") eq "yes";