From 6197b49ca505bb501de570c361114a32e59f8c88 Mon Sep 17 00:00:00 2001
From: cjwatson <>
Date: Sun, 15 Feb 2004 16:12:00 -0800
Subject: [PATCH] [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>.

---
 cgi/bugreport.cgi   | 3 ++-
 scripts/errorlib.in | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index c287311e..63419c34 100755
--- 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 b8a9bd17..63fa3327 100755
--- 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') {
-- 
2.39.5