FEAT #14152 TIME 2:00 format sender email only if mailer is smtp

modules/notifications/batch/process_email_stack.php

@@ -61,17 +61,19 @@ while ($state <> 'END') {
             $email->html_body = str_replace("\'", "'", $email->html_body);
             $email->html_body = str_replace("''", "'", $email->html_body);
 
-            if (empty($email->sender) && !empty((string)$mailerParams->mailfrom)) {
-                $email->sender = (string)$mailerParams->mailfrom;
-            }
+            if (((string)$mailerParams->type) == 'smtp') {
+                if (empty($email->sender) && !empty((string)$mailerParams->mailfrom)) {
+                    $email->sender = (string)$mailerParams->mailfrom;
+                }
 
-            if (substr($email->sender, 0, 1) != '<') {
-                $email->sender = '<' . $email->sender;
-            }
-            if (substr($email->sender, -1) != '>') {
-                $email->sender .= '>';
+                if (substr($email->sender, 0, 1) != '<') {
+                    $email->sender = '<' . $email->sender;
+                }
+                if (substr($email->sender, -1) != '>') {
+                    $email->sender .= '>';
+                }
             }
-            
+
             if ($email->sender <> '<>') {
                 $GLOBALS['mailer']->setReturnPath($email->sender);
                 $GLOBALS['mailer']->setFrom($email->sender);