summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2013-02-19 13:55:14 +0100
committerAndrey Andreev <narf@bofh.bg>2013-02-19 13:55:14 +0100
commitd2dbee42b379166e8be43e4e904f33a8c88ecef3 (patch)
tree78822ff23be5f835660db2eb18c93f85e36cb470 /system/libraries
parent268f4496a40b15af9fe52087cab4963d38020edd (diff)
parent32c1e626d51517418acbecadde9a83d67517e0a8 (diff)
Merge pull request #2261 from nisheeth-barthwal/develop
Fixed Issue #2239
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Email.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 074ce60fc..daa38484b 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1205,8 +1205,11 @@ class CI_Email {
{
if ($this->protocol === 'mail')
{
- $this->_subject = $this->_headers['Subject'];
- unset($this->_headers['Subject']);
+ if (isset($this->_headers['Subject']))
+ {
+ $this->_subject = $this->_headers['Subject'];
+ unset($this->_headers['Subject']);
+ }
}
reset($this->_headers);