diff options
| -rw-r--r-- | lib/PublicInbox/Feed.pm | 10 | ||||
| -rw-r--r-- | lib/PublicInbox/View.pm | 2 | ||||
| -rw-r--r-- | t/view.t | 12 |
3 files changed, 15 insertions, 9 deletions
diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index 226c50ea..95bde4f5 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -243,23 +243,25 @@ sub add_to_feed { my $midurl = $feed_opts->{midurl} || 'http://example.com/m/'; my $fullurl = $feed_opts->{fullurl} || 'http://example.com/f/'; - my $mid = $mime->header_obj->header_raw('Message-ID'); + my $header_obj = $mime->header_obj; + my $mid = $header_obj->header_raw('Message-ID'); defined $mid or return 0; $mid = PublicInbox::Hval->new_msgid($mid); my $href = $mid->as_href . '.html'; my $content = PublicInbox::View->feed_entry($mime, $fullurl . $href); defined($content) or return 0; + $mime = undef; - my $subject = mime_header($mime, 'Subject') or return 0; + my $subject = mime_header($header_obj, 'Subject') or return 0; - my $from = mime_header($mime, 'From') or return 0; + my $from = mime_header($header_obj, 'From') or return 0; my @from = Email::Address->parse($from); my $name = $from[0]->name; defined $name or $name = ""; my $email = $from[0]->address; defined $email or $email = ""; - my $date = $mime->header('Date'); + my $date = $header_obj->header('Date'); $date = PublicInbox::Hval->new_oneline($date); $date = feed_date($date->raw) or return 0; $add =~ tr!/!!d; diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 4f2833b3..55e12f26 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -116,6 +116,7 @@ sub index_entry { \$more); $part_nr++; }); + $mime->body_set(''); $rv .= "\n$pfx<a\nhref=\"$mhref\">$more</a> "; my $txt = "${path}m/$href.txt"; @@ -277,6 +278,7 @@ sub multipart_text_as_html { $rv .= "\n" unless $rv =~ /\n\z/s; ++$part_nr; }); + $mime->body_set(''); $rv; } @@ -39,9 +39,9 @@ EOF Subject => 'this is a subject', ], body => $body, - ); - $s = Email::MIME->new($s->as_string); - my $html = PublicInbox::View->msg_html($s); + )->as_string; + my $mime = Email::MIME->new($s); + my $html = PublicInbox::View->msg_html($mime); # ghetto tests like($html, qr!<a\nhref="\.\./m/hello%40!s, "MID link present"); @@ -52,7 +52,8 @@ EOF # short page my $pfx = "http://example.com/test/f"; - my $short = PublicInbox::View->msg_html($s, $pfx); + $mime = Email::MIME->new($s); + my $short = PublicInbox::View->msg_html($mime, $pfx); like($short, qr!<a\nhref="hello%40!s, "MID link present"); like($short, qr/\n> keep this inline/, "short quoted text is inline"); @@ -137,8 +138,9 @@ EOF parts => $parts, ); + my $orig = $mime->body_raw; my $html = PublicInbox::View->msg_html($mime); - like($mime->body_raw, qr/hi =3D bye=/, "our test used QP correctly"); + like($orig, qr/hi =3D bye=/, "our test used QP correctly"); like($html, qr/\bhi = bye\b/, "HTML output decoded QP"); } |