diff options
author | Eric Wong <e@80x24.org> | 2014-04-25 07:49:14 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2014-04-25 07:49:14 +0000 |
commit | 89f34da9a510bf87293721942d688b1425bb9cf7 (patch) | |
tree | fd2a623dd11429202996740cc4293288bdb9751b | |
parent | 483a67ca0613a75bb80ea4c1201cb2d5f2cf063d (diff) | |
download | public-inbox-89f34da9a510bf87293721942d688b1425bb9cf7.tar.gz |
-rw-r--r-- | lib/PublicInbox/Hval.pm | 1 | ||||
-rw-r--r-- | lib/PublicInbox/View.pm | 5 | ||||
-rwxr-xr-x | public-inbox.cgi | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm index 26a2d0bb..47b41a58 100644 --- a/lib/PublicInbox/Hval.pm +++ b/lib/PublicInbox/Hval.pm @@ -12,7 +12,6 @@ use URI::Escape qw(uri_escape); my $enc_utf8 = find_encoding('utf8'); my $enc_ascii = find_encoding('us-ascii'); -my $enc_mime = find_encoding('MIME-Header'); sub new { my ($class, $raw) = @_; diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index ecd49156..811e4703 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -11,6 +11,7 @@ use Encode::MIME::Header; use Email::MIME::ContentType qw/parse_content_type/; use constant MAX_INLINE_QUOTED => 5; use constant MAX_TRUNC_LEN => 72; +*ascii_html = *PublicInbox::Hval::ascii_html; my $enc_utf8 = find_encoding('utf8'); my $enc_ascii = find_encoding('us-ascii'); @@ -136,10 +137,6 @@ sub add_text_body_full { $s; } -sub ascii_html { - $enc_ascii->encode(escapeHTML($_[0]), Encode::HTMLCREF); -} - sub headers_to_html_header { my ($simple, $full_pfx) = @_; diff --git a/public-inbox.cgi b/public-inbox.cgi index fc48f2f4..9bc3dc2b 100755 --- a/public-inbox.cgi +++ b/public-inbox.cgi @@ -168,7 +168,7 @@ sub get_mid_html { return r404() unless $x; require PublicInbox::View; - my $mid_href = PublicInbox::View::ascii_html(uri_escape($ctx->{mid})); + my $mid_href = PublicInbox::Hval::ascii_html(uri_escape($ctx->{mid})); my $pfx = "../f/$mid_href.html"; require Email::MIME; [ "200 OK", {'Content-Type' => 'text/html'}, |