From 06d7ef7d4e28923186467d58a3ef244499f85c67 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Sun, 31 Jul 2016 21:08:29 +0200 Subject: [PATCH] Improve layout of text/plain emails --- .../system/email/mime/RecipientAwareTextMimePart.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wcfsetup/install/files/lib/system/email/mime/RecipientAwareTextMimePart.class.php b/wcfsetup/install/files/lib/system/email/mime/RecipientAwareTextMimePart.class.php index 806c86a3ef..fd395a5912 100644 --- a/wcfsetup/install/files/lib/system/email/mime/RecipientAwareTextMimePart.class.php +++ b/wcfsetup/install/files/lib/system/email/mime/RecipientAwareTextMimePart.class.php @@ -90,12 +90,12 @@ class RecipientAwareTextMimePart extends TextMimePart implements IRecipientAware return '['.$urls[$matches[1]].']'; }, $result); - $result = preg_replace_callback('/(\r?\n-- \r?\n|$)/', function ($matches) use ($urls) { - $list = ''; + $result = preg_replace_callback('/(?:\r?\n)*(\r?\n-- \r?\n|$)/', function ($matches) use ($urls) { + $list = "\r\n"; foreach ($urls as $url => $number) { $list .= "\r\n[".$number."] ".$url; } - return $list."\r\n".$matches[0]; + return $list."\r\n".$matches[1]; }, $result, 1); } -- 2.20.1