Skip to content

Commit

Permalink
A new release, version: 1.1.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
ivantcholakov committed Feb 12, 2014
1 parent 70893d6 commit 96c9f3e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
4 changes: 2 additions & 2 deletions README.md
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
------------
Expand Down
18 changes: 8 additions & 10 deletions libraries/MY_Email.php
Original file line number Diff line number Diff line change
Expand Up @@ -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).
*/

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 96c9f3e

Please sign in to comment.