From 75c707831668a5dbfa376316b38d9c584c1f1364 Mon Sep 17 00:00:00 2001
From: Leo Feyer <github@contao.org>
Date: Mon, 17 Mar 2014 15:45:15 +0100
Subject: [PATCH] Use a monospaced font for the plain text newsletter preview
 (see #6790)

---
 system/docs/CHANGELOG.md                         | 3 +++
 system/modules/newsletter/classes/Newsletter.php | 2 +-
 system/modules/newsletter/dca/tl_newsletter.php  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
index a84dbdf1e2..e5984578d4 100644
--- a/system/docs/CHANGELOG.md
+++ b/system/docs/CHANGELOG.md
@@ -4,6 +4,9 @@ Contao Open Source CMS changelog
 Version 3.2.9 (2014-XX-XX)
 --------------------------
 
+### Fixed
+Use a monospaced font for the plain text newsletter preview (see #6790).
+
 ### Fixed
 Adjust the `vScrollTo()` offset if the paste hint is visible (see #6478).
 
diff --git a/system/modules/newsletter/classes/Newsletter.php b/system/modules/newsletter/classes/Newsletter.php
index 9b368e81ee..dc8d6c26d8 100644
--- a/system/modules/newsletter/classes/Newsletter.php
+++ b/system/modules/newsletter/classes/Newsletter.php
@@ -263,7 +263,7 @@ public function send(\DataContainer $objDc)
 ' . $html . '
 </div>' : '') . '
 <div class="preview_text">
-' . nl2br_html5($text) . '
+<pre style="white-space:pre-wrap">' . $text . '</pre>
 </div>
 
 <div class="tl_tbox">
diff --git a/system/modules/newsletter/dca/tl_newsletter.php b/system/modules/newsletter/dca/tl_newsletter.php
index 6a35074eb5..41131c491c 100644
--- a/system/modules/newsletter/dca/tl_newsletter.php
+++ b/system/modules/newsletter/dca/tl_newsletter.php
@@ -421,7 +421,7 @@ public function listNewsletters($arrRow)
 <div class="cte_type ' . (($arrRow['sent'] && $arrRow['date']) ? 'published' : 'unpublished') . '"><strong>' . $arrRow['subject'] . '</strong> - ' . (($arrRow['sent'] && $arrRow['date']) ? sprintf($GLOBALS['TL_LANG']['tl_newsletter']['sentOn'], Date::parse($GLOBALS['TL_CONFIG']['datimFormat'], $arrRow['date'])) : $GLOBALS['TL_LANG']['tl_newsletter']['notSent']) . '</div>
 <div class="limit_height' . (!$GLOBALS['TL_CONFIG']['doNotCollapse'] ? ' h128' : '') . '">' . (!$arrRow['sendText'] ? '
 ' . $arrRow['content'] . '<hr>' : '' ) . '
-' . nl2br_html5($arrRow['text']) . '
+<pre style="white-space:pre-wrap">' . $arrRow['text'] . '</pre>
 </div>' . "\n";
 	}