From 397b77a86dfc9e69081fad63797ced50347c9835 Mon Sep 17 00:00:00 2001 From: nathangray Date: Thu, 29 Aug 2019 11:53:24 -0600 Subject: [PATCH] Mail - another fix for extra newlines, now with less out of memory errors --- api/src/Mail/Html.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/src/Mail/Html.php b/api/src/Mail/Html.php index 5710b323b5..13215d35df 100644 --- a/api/src/Mail/Html.php +++ b/api/src/Mail/Html.php @@ -311,7 +311,7 @@ class Html 4 => '~]*>\r*\n*~si', 5 => '~]*>\r*\n*~si', 6 => '~]*>~si', - 7 => '~]*>\r*\n*~si', + 7 => '~<\/p[^>r]*>\r*\n*~si', 8 => '~]*>\r*\n*~si', 9 => '~]*>\r*\n*~si', 10 => '~]*>\r*\n*~si', @@ -345,6 +345,8 @@ class Html 17 => '#lower#than#$1', 18 => '#greater#than#$1', ); + error_log(__LINE__); + error_log($_html); $_html = preg_replace($tags,$Replace,$_html); $_html = preg_replace('~\s*]*>~si',' - ',$_html); $_html = preg_replace('~]+>~s','',$_html);