]> Sergey Matveev's repositories - public-inbox.git/commitdiff
view: do not introduce excessive </pre> in $MID/t/ view
authorEric Wong <e@80x24.org>
Sat, 6 Aug 2016 00:26:38 +0000 (00:26 +0000)
committerEric Wong <e@80x24.org>
Sat, 6 Aug 2016 00:30:03 +0000 (00:30 +0000)
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")
lib/PublicInbox/View.pm

index e150a015de821058e2e34dc6eddb3664b8725cfc..d6711d5c257d06bb03869b7212c1a1b71d4655fa 100644 (file)
@@ -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 ($$;$) {