Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Merge new line email template fix

Browse Source
This commit is contained in:
Hillel Coren 2017-03-19 15:35:20 +02:00
parent 7305c9e483
commit 3bcba163c4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Models/Traits/SendsEmails.php
View File

@ -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);
}