From aa0e67e63e58e0ee4fc3918bde25b9c04d48954a Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 15 Feb 2020 09:46:33 +0000 Subject: view: remove mhref arg from multipart_text_as_html No point in passing something on stack only to stash it into the $ctx which holds most other parameters used for rendering the HTML. --- lib/PublicInbox/View.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/PublicInbox/View.pm') diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index d097d8ab..dcaee1ae 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -29,8 +29,9 @@ sub msg_page_i { my $more = $ctx->{more}; if ($nr == 1) { # $more cannot be true w/o $smsg being defined: - my $upfx = $more ? '../'.mid_escape($ctx->{smsg}->mid).'/' : ''; - multipart_text_as_html(delete $ctx->{mime}, $upfx, $ctx); + $ctx->{mhref} = $more ? '../'.mid_escape($ctx->{smsg}->mid).'/' + : ''; + multipart_text_as_html(delete $ctx->{mime}, $ctx); ${delete $ctx->{obuf}} .= '
'; } elsif ($more) { ++$ctx->{end_nr}; @@ -83,10 +84,10 @@ sub msg_page_more { my $next = $ibx->over->next_by_mid($ctx->{mid}, \$id, \$prev); $ctx->{more} = $next ? [ $id, $prev, $next ] : undef; return '' unless $smsg; - my $upfx = '../' . mid_escape($smsg->mid) . '/'; + $ctx->{mhref} = '../' . mid_escape($smsg->mid) . '/'; my $mime = delete $smsg->{mime}; _msg_page_prepare_obuf($mime->header_obj, $ctx, $nr); - multipart_text_as_html($mime, $upfx, $ctx); + multipart_text_as_html($mime, $ctx); ${delete $ctx->{obuf}} .= '
'; } @@ -486,11 +487,10 @@ sub thread_html_i { # PublicInbox::WwwStream::getline callback } sub multipart_text_as_html { - my (undef, $mhref, $ctx) = @_; # $mime = $_[0] - $ctx->{mhref} = $mhref; + # ($mime, $ctx) = @_; # msg_iter will do "$_[0] = undef" # scan through all parts, looking for displayable text - msg_iter($_[0], \&add_text_body, $ctx, 1); + msg_iter($_[0], \&add_text_body, $_[1], 1); } sub flush_quote { -- cgit v1.2.3-24-ge0c7