From 3bcba163c41a8236c5c0167674c5f42813747f29 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 19 Mar 2017 15:35:20 +0200
Subject: [PATCH] Merge new line email template fix

---
 app/Models/Traits/SendsEmails.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Models/Traits/SendsEmails.php b/app/Models/Traits/SendsEmails.php
index a939f85f93eb..1e981a1280ae 100644
--- a/app/Models/Traits/SendsEmails.php
+++ b/app/Models/Traits/SendsEmails.php
@@ -36,7 +36,7 @@ trait SendsEmails
             $value = $this->$field;
 
             if ($value) {
-                return $value;
+                return preg_replace("/\r\n|\r|\n/", ' ', $value);
             }
         }
 
@@ -66,7 +66,7 @@ trait SendsEmails
         }
 
         if ($message) {
-            $template .= "$message<p/>\r\n\r\n";
+            $template .= "$message<p/>";
         }
 
         return $template . '$footer';
@@ -91,6 +91,8 @@ trait SendsEmails
             $template = $this->getDefaultEmailTemplate($entityType, $message);
         }
 
+        $template = preg_replace("/\r\n|\r|\n/", ' ', $template);
+
         // <br/> is causing page breaks with the email designs
         return str_replace('/>', ' />', $template);
     }