view: handle missing Content-Type in message

Email::MIME internally assumes "text/plain" for messages
missing a Content-Type, but does not expose that in the
Email::MIME::content_type API method.  We must assume it
ourselves to avoid uninitialized value warnings for the
rare (nowadays) MUAs which do not set it.

1 files changed, 2 insertions, 3 deletions

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 6997c1c5..93592097 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -413,7 +413,6 @@ sub attach_link ($$$$;$) {
         my $nl = $idx[-1] > 1 ? "\n" : '';
         my $idx = join('.', @idx);
         my $size = bytes::length($part->body);
-        $ct ||= 'text/plain';
 
         # hide attributes normally, unless we want to aid users in
         # spotting MUA problems:
@@ -444,10 +443,10 @@ sub attach_link ($$$$;$) {
 sub add_text_body {
         my ($upfx, $p) = @_; # from msg_iter: [ Email::MIME, depth, @idx ]
         my ($part, $depth, @idx) = @$p;
-        my $ct = $part->content_type;
+        my $ct = $part->content_type || 'text/plain';
         my $fn = $part->filename;
 
-        if (defined $ct && $ct =~ m!\btext/x?html\b!i) {
+        if ($ct =~ m!\btext/x?html\b!i) {
                 return attach_link($upfx, $ct, $p, $fn);
         }