-
Notifications
You must be signed in to change notification settings - Fork 291
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
70893d6
commit 96c9f3e
Showing
2 changed files
with
10 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
A CodeIgniter compatible email-library powered by PHPMailer | ||
=========================================================== | ||
|
||
Version: 1.1.1 | ||
Version: 1.1.2 | ||
Author: Ivan Tcholakov <[email protected]>, 2012-2014. | ||
License: The MIT License (MIT), http://opensource.org/licenses/MIT | ||
|
||
Tested on CodeIgniter 3.0-dev (January 26th, 2014) and with PHPMailer Version 5.2.7 (September 12th, 2013). | ||
Tested on CodeIgniter 3.0-dev (February 12th, 2014) and with PHPMailer Version 5.2.7 (September 12th, 2013). | ||
|
||
Installation | ||
------------ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,12 +2,12 @@ | |
|
||
/** | ||
* CodeIgniter compatible email-library powered by PHPMailer. | ||
* Version: 1.1.1 | ||
* Version: 1.1.2 | ||
* @author Ivan Tcholakov <[email protected]>, 2012-2014. | ||
* @license The MIT License (MIT), http://opensource.org/licenses/MIT | ||
* @link https://github.com/ivantcholakov/codeigniter-phpmailer | ||
* | ||
* Tested on production sites with CodeIgniter 3.0-dev (January 26th, 2014) and | ||
* Tested on production sites with CodeIgniter 3.0-dev (February 12th, 2014) and | ||
* PHPMailer Version 5.2.7 (September 12th, 2013). | ||
*/ | ||
|
||
|
@@ -449,16 +449,10 @@ public function message($body) { | |
if ($this->mailer_engine == 'phpmailer') { | ||
|
||
$this->phpmailer->Body = $body; | ||
|
||
if ($this->mailtype == 'html') { | ||
$this->phpmailer->AltBody = $this->_get_alt_message(); | ||
} | ||
|
||
} else { | ||
|
||
parent::message($body); | ||
} | ||
|
||
parent::message($body); | ||
|
||
return $this; | ||
} | ||
|
||
|
@@ -583,6 +577,10 @@ public function send($auto_clear = true) { | |
|
||
if ($this->mailer_engine == 'phpmailer') { | ||
|
||
if ($this->mailtype == 'html') { | ||
$this->phpmailer->AltBody = $this->_get_alt_message(); | ||
} | ||
|
||
$result = (bool) $this->phpmailer->send(); | ||
|
||
if ($result) { | ||
|