[project @ 2004-02-15 16:12:00 by cjwatson]

Stop pretending to understand text/enriched when we clearly don't. Reported
by Steven Leach on debian-user, Message-Id:
<1EAAE989-5FC5-11D8-875A-000393AF4F78@mac.com>.

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index c287311e4de2379424e6fe3aa9ae1924cb3846f1..63419c343dc4854294f0762769dcb9bc0799ff65 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -98,7 +98,8 @@ sub display_entity ($$$$\$\@) {
     }
 
     return if not $top and $disposition eq 'attachment' and not defined($att);
-    return unless ($type =~ m[^text/?] and $type !~ m[^text/html(?:;|$)]) or
+    return unless ($type =~ m[^text/?] and
+                  $type !~ m[^text/(?:html|enriched)(?:;|$)]) or
                  $type =~ m[^application/pgp(?:;|$)] or
                  $entity->parts;
 

diff --git a/scripts/errorlib.in b/scripts/errorlib.in
index b8a9bd17adb1e639ebbc5ba715c1c1e40f1fe1fc..63fa332734f2ccd4d31889a25ebd44f533af137e 100755 (executable)
--- a/scripts/errorlib.in
+++ b/scripts/errorlib.in
@@ -1,5 +1,5 @@
 # -*- perl -*-
-# $Id: errorlib.in,v 1.40 2003/08/30 00:15:15 cjwatson Exp $
+# $Id: errorlib.in,v 1.41 2004/02/15 16:12:00 cjwatson Exp $
 
 use Mail::Address;
 
@@ -347,8 +347,7 @@ sub appendfile {
 sub getmailbody {
        my $entity = shift;
        my $type = $entity->effective_type;
-       if ($type eq 'text/plain' or
-           ($type =~ m#text/# and $type ne 'text/html') or
+       if ($type =~ m#text/(?!html|enriched)# or
            $type eq 'application/pgp') {
                return $entity->bodyhandle;
        } elsif ($type eq 'multipart/alternative') {