Minor CGL fix in t3lib/class.t3lib_htmlmail.php
authorChristian Kuhn <lolli@schwarzbu.ch>
Thu, 30 Dec 2010 16:18:08 +0000 (16:18 +0000)
committerChristian Kuhn <lolli@schwarzbu.ch>
Thu, 30 Dec 2010 16:18:08 +0000 (16:18 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9967 709f56b5-9817-0410-a4d7-c38de5d9e867

t3lib/class.t3lib_htmlmail.php

index d4ca849..efb7117 100644 (file)
@@ -722,16 +722,20 @@ class t3lib_htmlmail {
                        // If safe mode is on, the fifth parameter to mail is not allowed, so the fix wont work on unix with safe_mode=On
                $returnPathPossible = (!t3lib_utility_PhpOptions::isSafeModeEnabled() && $this->forceReturnPath);
                if ($returnPathPossible) {
-                       $mailWasSent = t3lib_utility_Mail::mail($recipient,
-                                                                                                       $this->subject,
-                                                                                                       $this->message,
-                                                                                                       $this->headers,
-                                                                                                       $returnPath);
+                       $mailWasSent = t3lib_utility_Mail::mail(
+                               $recipient,
+                               $this->subject,
+                               $this->message,
+                               $this->headers,
+                               $returnPath
+                       );
                } else {
-                       $mailWasSent = t3lib_utility_Mail::mail($recipient,
-                                                                                                       $this->subject,
-                                                                                                       $this->message,
-                                                                                                       $this->headers);
+                       $mailWasSent = t3lib_utility_Mail::mail(
+                               $recipient,
+                               $this->subject,
+                               $this->message,
+                               $this->headers
+                       );
                }
 
                        // Auto response
@@ -741,16 +745,20 @@ class t3lib_htmlmail {
                        $theParts[1] = str_replace("/", LF, $theParts[1]);
                        $theParts[1] = str_replace("###MESSAGE###", $this->getContent('plain'), $theParts[1]);
                        if ($returnPathPossible) {
-                               $mailWasSent = t3lib_utility_Mail::mail($this->from_email,
-                                                                                                               $theParts[0],
-                                                                                                               $theParts[1],
-                                                                                                               'From: ' . $recipient,
-                                                                                                               $returnPath);
+                               $mailWasSent = t3lib_utility_Mail::mail(
+                                       $this->from_email,
+                                       $theParts[0],
+                                       $theParts[1],
+                                       'From: ' . $recipient,
+                                       $returnPath
+                               );
                        } else {
-                               $mailWasSent = t3lib_utility_Mail::mail($this->from_email,
-                                                                                                               $theParts[0],
-                                                                                                               $theParts[1],
-                                                                                                               'From: ' . $recipient);
+                               $mailWasSent = t3lib_utility_Mail::mail(
+                                       $this->from_email,
+                                       $theParts[0],
+                                       $theParts[1],
+                                       'From: ' . $recipient
+                               );
                        }
                }
                if ($this->returnPath) {