lib/PublicInbox/Feed.pm | 25 +++++++++++--------------
diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index e593aace041e030c08ff06b9e2c4bd4732f256de..d2bdea0d685886437ea70cbf83560cbdf9f82c63 100644
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -73,12 +73,10 @@ });
my $th = Mail::Thread->new(@messages);
$th->thread;
- my @out = (
- "$title" .
+ my $html = "$title" .
'' .
- '');
- push @out, $feed_opts->{midurl};
+ '';
# sort by date, most recent at top
$th->order(sub {
@@ -87,11 +85,11 @@ $b->topmost->message->header('X-PI-Date') <=>
$a->topmost->message->header('X-PI-Date')
} @_;
});
- dump_html_line($_, 0, \@out) for $th->rootset;
+ dump_html_line($_, 0, \$html) for $th->rootset;
my $footer = nav_footer($args->{cgi}, $last);
$footer = "
$footer
" if $footer;
- $out[0] . "$footer";
+ $html . "$footer";
}
# private subs
@@ -104,8 +102,7 @@ my $head = ' ';
my $next = ' ';
if ($last) {
- $next = $cgi->path_info . "?r=$last";
- $next = qq!next!;
+ $next = qq!next!;
}
if ($old_r) {
$head = $cgi->path_info;
@@ -275,14 +272,14 @@ 1;
}
sub dump_html_line {
- my ($self, $level, $args) = @_; # args => [ $html, $midurl ]
+ my ($self, $level, $html) = @_;
if ($self->message) {
- $args->[0] .= (' ' x $level);
+ $$html .= (' ' x $level);
my $mime = $self->message;
my $subj = $mime->header('Subject');
my $mid = $mime->header_obj->header_raw('Message-ID');
$mid = PublicInbox::Hval->new_msgid($mid);
- my $url = $args->[1] . $mid->as_href;
+ my $href = 'm/' . $mid->as_href . '.html';
my $from = mime_header($mime, 'From');
my @from = Email::Address->parse($from);
@@ -291,10 +288,10 @@ (defined($from) && length($from)) or $from = $from[0]->address;
$from = PublicInbox::Hval->new_oneline($from)->as_html;
$subj = PublicInbox::Hval->new_oneline($subj)->as_html;
- $args->[0] .= "$subj $from\n";
+ $$html .= "$subj $from\n";
}
- dump_html_line($self->child, $level+1, $args) if $self->child;
- dump_html_line($self->next, $level, $args) if $self->next;
+ dump_html_line($self->child, $level+1, $html) if $self->child;
+ dump_html_line($self->next, $level, $html) if $self->next;
}
sub try_git_pm {