lib/PublicInbox/Feed.pm | 8 ++++---- lib/PublicInbox/Hval.pm | 3 ++- lib/PublicInbox/SearchView.pm | 2 +- lib/PublicInbox/View.pm | 18 ++++++++++-------- diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index 150bea038241b57addb71cd34866d71cac3f7c7f..7ebc0505602f5e11d6ce5b39fc8d8b4ebf461805 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -128,18 +128,18 @@ my $top = "$title (Atom feed)"; if ($srch) { - $top = qq{
} . - PublicInbox::Hval::PRE; + q{}
} else {
- $top = PublicInbox::Hval::PRE . $top . "\n";
+ $top = '' . $top . "\n";
}
$fh->write("$title " .
"" .
+ PublicInbox::Hval::STYLE .
"$top");
# if the 'r' query parameter is given, it is a legacy permalink
diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm
index e0b85c685c58d0b8824d0e19d39560f0920605ca..5a869358d1b8029d3e2a0a9f4f386b1d26fa5090 100644
--- a/lib/PublicInbox/Hval.pm
+++ b/lib/PublicInbox/Hval.pm
@@ -13,7 +13,8 @@
# for user-generated content (UGC) which may have excessively long lines
# and screw up rendering on some browsers. This is the only CSS style
# feature we use.
-use constant PRE => "";
+use constant STYLE => '';
+use constant PRE => ""; # legacy
my $enc_ascii = find_encoding('us-ascii');
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index fec4f39f84d8841c19ce0dc0f10862eed2de2579..5b15e0d7e2fed72ef84fe0785d34f8e2ffd5dfc3 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -32,7 +32,7 @@ $mset = $ctx->{srch}->query($q->{q}, $opts);
$total = $mset->get_matches_estimated;
};
my $err = $@;
- my $res = html_start($q, $ctx) . PublicInbox::Hval::PRE;
+ my $res = html_start($q, $ctx) . ''
if ($err) {
$code = 400;
$res .= err_txt($err) . "
" . foot($ctx);
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 523d27fe997b09394619b8ae6136a8631625ab96..7603c514cf999c9b01095d697a1698ebbe3dcc58 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -38,7 +38,7 @@ $footer = '';
}
headers_to_html_header($mime, $full_pfx, $ctx) .
multipart_text_as_html($mime, $full_pfx) .
- '
' . PublicInbox::Hval::PRE .
+ '
' .
html_footer($mime, 1, $full_pfx, $ctx) .
$footer .
'
';
@@ -47,6 +47,7 @@
sub feed_entry {
my ($class, $mime, $full_pfx) = @_;
+ # no here for