diff options
author | Eric Roberts <eric@cryode.com> | 2012-08-03 22:39:04 +0200 |
---|---|---|
committer | Eric Roberts <eric@cryode.com> | 2012-08-03 22:39:04 +0200 |
commit | 17636e8bb20a4d53fec8fd8aaf530f53bd22d612 (patch) | |
tree | a844b9aff5ecb42ce2c49ea4e187ef44cc4d39a8 /system/libraries/Email.php | |
parent | da038d2ebccb4d45ea6d819c914563b2bc009a86 (diff) | |
parent | 6c94c2dcfb6557947c9ac67e419b2856fd80e01d (diff) |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/libraries/Email.php')
-rw-r--r-- | system/libraries/Email.php | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index fdb9be4da..8fd7a79e7 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1238,7 +1238,7 @@ class CI_Email { * * @return bool */ - public function send() + public function send($auto_clear = TRUE) { if ($this->_replyto_flag === FALSE) { @@ -1257,11 +1257,25 @@ class CI_Email { if ($this->bcc_batch_mode && count($this->_bcc_array) > $this->bcc_batch_size) { - return $this->batch_bcc_send(); + $result = $this->batch_bcc_send(); + + if ($result && $auto_clear) + { + $this->clear(); + } + + return $result; } $this->_build_message(); - return $this->_spool_email(); + $result = $this->_spool_email(); + + if ($result && $auto_clear) + { + $this->clear(); + } + + return $result; } // -------------------------------------------------------------------- |