diff options
| -rw-r--r-- | lib/PublicInbox/Hval.pm | 21 | ||||
| -rw-r--r-- | lib/PublicInbox/View.pm | 5 |
2 files changed, 2 insertions, 24 deletions
diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm index 40c97da4..5f7ab513 100644 --- a/lib/PublicInbox/Hval.pm +++ b/lib/PublicInbox/Hval.pm @@ -16,17 +16,6 @@ my $enc_ascii = find_encoding('us-ascii'); # safe-ish acceptable filename pattern for portability our $FN = '[a-zA-Z0-9][a-zA-Z0-9_\-\.]+[a-zA-Z0-9]'; # needs \z anchor -sub new { - my ($class, $raw, $href) = @_; - - # we never care about trailing whitespace - $raw =~ s/\s*\z//; - bless { - raw => $raw, - href => defined $href ? $href : $raw, - }, $class; -} - sub mid_href { ascii_html(mid_escape($_[0])) } # some of these overrides are standard C escapes so they're @@ -71,16 +60,6 @@ sub ascii_html { $enc_ascii->encode($s, Encode::HTMLCREF); } -sub as_html { ascii_html($_[0]->{raw}) } - -sub raw { - if (defined $_[1]) { - $_[0]->{raw} = $_[1]; - } else { - $_[0]->{raw}; - } -} - # returns a protocol-relative URL string sub prurl ($$) { my ($env, $u) = @_; diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 14b7d81d..980f265a 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -630,10 +630,9 @@ sub _msg_page_prepare_obuf { } my @title; # (Subject[0], From[0]) for my $v ($hdr->header('From')) { - $v = PublicInbox::Hval->new($v); - my @n = PublicInbox::Address::names($v->raw); + my @n = PublicInbox::Address::names($v); + $v = ascii_html($v); $title[1] //= ascii_html(join(', ', @n)); - $v = $v->as_html; if ($obfs_ibx) { obfuscate_addrs($obfs_ibx, $v); obfuscate_addrs($obfs_ibx, $title[1]); |