@@ -206,6 +206,4 @@ |
||
206 | 206 | $mail->loadDocuments($xml, $pdf); |
207 | 207 | $mail->loadTemplate($htmltemplate); |
208 | 208 | $mail->send($addresses, false); |
209 | - return $mail; |
|
210 | - } |
|
211 | -} |
|
209 | + return $mail |
|
212 | 210 | \ No newline at end of file |
@@ -206,6 +206,4 @@ |
||
206 | 206 | $mail->loadDocuments($xml, $pdf); |
207 | 207 | $mail->loadTemplate($htmltemplate); |
208 | 208 | $mail->send($addresses, false); |
209 | - return $mail; |
|
210 | - } |
|
211 | -} |
|
209 | + return $mail |
|
212 | 210 | \ No newline at end of file |
@@ -206,6 +206,4 @@ |
||
206 | 206 | $mail->loadDocuments($xml, $pdf); |
207 | 207 | $mail->loadTemplate($htmltemplate); |
208 | 208 | $mail->send($addresses, false); |
209 | - return $mail; |
|
210 | - } |
|
211 | -} |
|
209 | + return $mail |
|
212 | 210 | \ No newline at end of file |
@@ -206,6 +206,4 @@ |
||
206 | 206 | $mail->loadDocuments($xml, $pdf); |
207 | 207 | $mail->loadTemplate($htmltemplate); |
208 | 208 | $mail->send($addresses, false); |
209 | - return $mail; |
|
210 | - } |
|
211 | -} |
|
209 | + return $mail |
|
212 | 210 | \ No newline at end of file |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | if (!empty($config->timelimit)) { |
83 | 83 | $this->mail->Timelimit = $config->timelimit; |
84 | 84 | } |
85 | -<<<<<<< HEAD |
|
85 | +<< << <<< HEAD |
|
86 | 86 | if (isset($config->smtpoptions) && is_array($config->smtpoptions)) { |
87 | 87 | ======= |
88 | 88 | if (is_array($config->smtpoptions)) { |
@@ -206,6 +206,4 @@ discard block |
||
206 | 206 | $mail->loadDocuments($xml, $pdf); |
207 | 207 | $mail->loadTemplate($htmltemplate); |
208 | 208 | $mail->send($addresses, false); |
209 | - return $mail; |
|
210 | - } |
|
211 | -} |
|
209 | + return $mail |
|
212 | 210 | \ No newline at end of file |
@@ -206,6 +206,4 @@ |
||
206 | 206 | $mail->loadDocuments($xml, $pdf); |
207 | 207 | $mail->loadTemplate($htmltemplate); |
208 | 208 | $mail->send($addresses, false); |
209 | - return $mail; |
|
210 | - } |
|
211 | -} |
|
209 | + return $mail |
|
212 | 210 | \ No newline at end of file |
@@ -206,6 +206,4 @@ |
||
206 | 206 | $mail->loadDocuments($xml, $pdf); |
207 | 207 | $mail->loadTemplate($htmltemplate); |
208 | 208 | $mail->send($addresses, false); |
209 | - return $mail; |
|
210 | - } |
|
211 | -} |
|
209 | + return $mail |
|
212 | 210 | \ No newline at end of file |