about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2016-08-06 00:26:38 +0000
committerEric Wong <e@80x24.org>2016-08-06 00:30:03 +0000
commitb478f5be70f5e210347c7692333bb65ad3316f72 (patch)
tree47aa61f0ce5a10484f1c80325fb287fbafda1511
parent17badb16f33317a3ceb389abe3c79a3f0e24c5cc (diff)
downloadpublic-inbox-b478f5be70f5e210347c7692333bb65ad3316f72.tar.gz
view: do not introduce excessive </pre> in $MID/t/ view
When using <ul><li>..., we already setup <pre> tags
in thread_index_entry, so having an extra </pre> tag
causes validation errors.

Fixes: 6ef9b216156c ("view: use <hr> to delineate in /$MID/T/ view")
-rw-r--r--lib/PublicInbox/View.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index e150a015..d6711d5c 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -164,13 +164,17 @@ sub index_entry {
                 "<a\nhref=\"$mhref\">permalink</a>" .
                 " <a\nhref=\"${mhref}raw\">raw</a>" .
                 " <a\nhref=\"${mhref}#R\">reply</a>";
+
+        my $hr;
         if (my $pct = $ctx->{pct}) { # used by SearchView.pm
                 $rv .= "\t[relevance $pct->{$mid_raw}%]";
+                $hr = 1;
         } elsif ($mapping) {
                 my $threaded = 'threaded';
                 my $flat = 'flat';
                 my $end = '';
                 if ($ctx->{flat}) {
+                        $hr = 1;
                         $flat = "<b>$flat</b>";
                 } else {
                         $threaded = "<b>$threaded</b>";
@@ -180,7 +184,8 @@ sub index_entry {
                 $rv .= " <a\nhref=#r$id>$ctx->{s_nr}</a>";
         }
 
-        $rv .= $more ? '</pre><hr><pre>' : '</pre>';
+        $rv .= $more ? '</pre><hr><pre>' : '</pre>' if $hr;
+        $rv;
 }
 
 sub pad_link ($$;$) {