From f94c3a195a25a31d0215cd175938008fca473378 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 18 Apr 2019 23:31:46 +0000 Subject: view: show "(no subject)" consistently in HTML Empty subjects ("") and undefined Subjects: are now both displayed as "(no subject)" for now. --- lib/PublicInbox/SearchView.pm | 1 + lib/PublicInbox/View.pm | 3 +++ 2 files changed, 4 insertions(+) diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm index 7ef6b075..3b3afdee 100644 --- a/lib/PublicInbox/SearchView.pm +++ b/lib/PublicInbox/SearchView.pm @@ -120,6 +120,7 @@ sub mset_summary { } my $date = PublicInbox::View::fmt_ts($smsg->ds); my $mid = PublicInbox::Hval->new_msgid($smsg->mid)->{href}; + $s = '(no subject)' if $s eq ''; $$res .= qq{$rank. }. $s . "\n"; $$res .= "$pfx - by $f @ $date UTC [$pct%]\n\n"; diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index f94daaf2..62bdf0a1 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -213,6 +213,7 @@ sub index_entry { my $irt; my $obfs_ibx = $ctx->{-obfs_ibx}; + $subj = '(no subject)' if $subj eq ''; my $rv = "* "; $subj = ''.ascii_html($subj).''; obfuscate_addrs($obfs_ibx, $subj) if $obfs_ibx; @@ -729,6 +730,7 @@ sub thread_skel { my $subj = $hdr->header('Subject'); defined $subj or $subj = ''; + $subj = '(no subject)' if $subj eq ''; $ctx->{prev_subj} = [ split(/ /, $srch->subject_normalized($subj)) ]; $ctx->{cur} = $mid; $ctx->{prev_attr} = ''; @@ -1039,6 +1041,7 @@ sub acc_topic { if ($x) { $subj = $x->subject; $subj = $srch->subject_normalized($subj); + $subj = '(no subject)' if $subj eq ''; $ds = $x->ds; if ($level == 0) { $topic = [ $ds, 1, { $subj => $mid }, $subj ]; -- cgit v1.2.3-24-ge0c7