- Fix double leading spaces of format=flowed messages

    (closes: #428056)

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index b001d91a303521539caee82d69fa78987f0905db..24b51e49306cfba4071942a96027aba85c87e1f9 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -176,6 +176,12 @@ sub display_entity ($$$$\$\@) {
              my $body = $entity->bodyhandle->as_string;
              $body = convert_to_utf8($body,$charset) if defined $charset;
              $body = html_escape($body);
+             # Attempt to deal with format=flowed
+             if ($content_type =~ m/format\s*=\s*\"?flowed\"?/i) {
+                  $body =~ s{^\s}{}mgo;
+                  # we ignore the other things that you can do with
+                  # flowed e-mails cause they don't really matter.
+             }
              # Add links to URLs
              $body =~ s,((ftp|http|https)://[\S~-]+?/?)((\&gt\;)?[)]?[']?[:.\,]?(\s|$)),<a href=\"$1\">$1</a>$3,go;
              # Add links to bug closures

diff --git a/debian/changelog b/debian/changelog
index 9fbe1ac0f55a67b01f24585232cbdb94e6919b10..10e060d9ad801afe86a1a6c5ae686c7ec863af31 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -177,6 +177,8 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Indicate the selected user (closes: #422934)
     - Use source package for usertags where possible (closes: #415933)
     - Add PR-Package header for control messages (closes: #414023)
+    - Fix double leading spaces of format=flowed messages
+      (closes: #428056)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100