From b17743ef9e62cbc3fec43a8aeafb8019435c1fff Mon Sep 17 00:00:00 2001
From: e107steved <steved@e107.org>
Date: Sat, 27 Jan 2007 17:47:29 +0000
Subject: [PATCH] Bugtracker #3698 - XHTML compliance should sort line breaks
 in plain text newsletter

---
 e107_plugins/newsletter/admin_config.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/e107_plugins/newsletter/admin_config.php b/e107_plugins/newsletter/admin_config.php
index b6dc4eea8..b880e3150 100644
--- a/e107_plugins/newsletter/admin_config.php
+++ b/e107_plugins/newsletter/admin_config.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/newsletter/admin_config.php,v $
-|     $Revision: 1.4 $
-|     $Date: 2007-01-20 16:27:14 $
-|     $Author: mrpete $
+|     $Revision: 1.5 $
+|     $Date: 2007-01-27 17:47:29 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
@@ -401,12 +401,12 @@ class newsletter
 		$mail_style .= "<div style='width:90%; padding-top:10px'>";
 		$mail_style .= "<div class='fcaption'><b>$message_subject<br />[ ".NLLAN_12." ".$newsletterInfo['newsletter_issue']." ]</b></div><br /><br />";
 		$mail_style .= "<div class='forumheader3'>";
-		$message_body = $mail_style.$newsletter_header."<hr />".$message_body."<br><br><hr />".$newsletter_footer."<br></div></div>";
+		$message_body = $mail_style.$newsletter_header."<hr />".$message_body."<br /><br /><hr />".$newsletter_footer."<br /></div></div>";
 
-		$message_body = str_replace("\n", "<br>", $message_body);
+		$message_body = str_replace("\n", "<br />", $message_body);
 
-		$mail->Body = $tp->toHTML($message_body, TRUE);
-		$mail->AltBody = strip_tags(str_replace("<br>", "\n", $message_body));
+		$mail->Body = $tp->toHTML($message_body, TRUE,'no_replace, emotes_off');
+		$mail->AltBody = strip_tags(str_replace("<br />", "\n", $message_body));
 
 		$sent_counter = 0;