Merge branch 'hotfix/1.5.8'

terminal42 · Jul 5, 2019 · 55d6cfa · 55d6cfa
2 parents 377ca4c + c5a168c
commit 55d6cfa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/library/NotificationCenter/Gateway/Email.php b/library/NotificationCenter/Gateway/Email.php
@@ -91,7 +91,12 @@ public function sendDraft(EmailMessageDraft $objDraft)
 
         // Set reply-to address
         if ($strReplyTo = $objDraft->getReplyToEmail()) {
-            $objEmail->replyTo($strReplyTo);
+            try {
+                $objEmail->replyTo($strReplyTo);
+            } catch (\Exception $e) {
+                \System::log(sprintf('Could not send email for message ID %s: %s', $objDraft->getMessage()->id, $e->getMessage()), __METHOD__, TL_ERROR);
+                return false;
+            }
         }
 
         // Set email subject

diff --git a/library/NotificationCenter/Util/StringUtil.php b/library/NotificationCenter/Util/StringUtil.php
@@ -73,11 +73,7 @@ public static function getTokenAttachments($strAttachmentTokens, array $arrToken
         }
 
         foreach (trimsplit(',', $strAttachmentTokens) as $strToken) {
-            if (version_compare(VERSION . '.' . BUILD, '3.5.1', '<')) {
-                $strParsedToken = \String::parseSimpleTokens($strToken, $arrTokens);
-            } else {
-                $strParsedToken = \StringUtil::parseSimpleTokens($strToken, $arrTokens);
-            }
+            $strParsedToken = \Haste\Util\StringUtil::recursiveReplaceTokensAndTags($strToken, $arrTokens);
 
             foreach (trimsplit(',', $strParsedToken) as $strFile) {
                 $strFileFull = TL_ROOT . '/' . $strFile;