From: Don Armstrong <don@donarmstrong.com>
Date: Thu, 28 Jun 2007 05:24:57 +0000 (-0700)
Subject:  * Use our $bug_order for mod_perl issues
X-Git-Tag: release/2.6.0~529^2~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=beca983387b33b635fb6fcec8d342d031baae152;p=debbugs.git

 * 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 f9a44566..590a2f67 100644
--- 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 e3b3d4be..731b4154 100755
--- 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";