[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.3-55-ged1dd75

[Alex Vandiver]

The branch, 4.2-trunk has been updated
       via  ed1dd75fdc6b9a9f6ca662c9deb6ea6127783779 (commit)
       via  6b117af04b443d4ed581aef9a88a4dc6b66924e0 (commit)
      from  167e3ad160538ddf6f22d4e6c95414964f676014 (commit)

Summary of changes:
 lib/RT/Transaction.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit 6b117af04b443d4ed581aef9a88a4dc6b66924e0
Author: Thomas Sibley <trsibley at uw.edu>
Date:   Thu Feb 6 09:42:41 2014 -0800

    When converting a plain text message to HTML, don't use <pre>
    
    Honor whitespace but allow lines to wrap using CSS.  Otherwise long unbroken
    lines are mailed out and horizontal scrolling is required.

diff --git a/lib/RT/Transaction.pm b/lib/RT/Transaction.pm
index d2e78d8..025de94 100644
--- a/lib/RT/Transaction.pm
+++ b/lib/RT/Transaction.pm
@@ -368,7 +368,7 @@ sub Content {
                 $content =~ s/&/&/g;
                 $content =~ s/</</g;
                 $content =~ s/>/>/g;
-                $content = "<pre>$content</pre>";
+                $content = "<div style='white-space: pre-wrap; font-family: monospace;'>$content</div>";
             }
         }
     }

commit ed1dd75fdc6b9a9f6ca662c9deb6ea6127783779
Merge: 167e3ad 6b117af
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Mar 20 18:58:28 2014 -0400

    Merge branch '4.2/plain-text-in-html-mail' into 4.2-trunk


-----------------------------------------------------------------------