diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-01-11 11:09:52 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-01-11 11:09:52 +0100 |
| commit | 38b08116c61c0a68e6d350c986f75589220692ed (patch) | |
| tree | fa8a9b5a0f0be955d42110b67037d1ff46e54604 /system/libraries/Email.php | |
| parent | 34251bfec2627fb0526d5f99f3a13a3d8a4506d8 (diff) | |
| parent | fd5fe1a64c03ae7204a7e72d936215f7a61d8c30 (diff) | |
Merge branch '3.0-stable' into develop
Resolved conflicts:
system/database/drivers/mysql/mysql_driver.php
system/database/drivers/mysqli/mysqli_driver.php
Diffstat (limited to 'system/libraries/Email.php')
| -rw-r--r-- | system/libraries/Email.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 034586ac9..754dd1784 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1854,8 +1854,7 @@ class CI_Email { // is popen() enabled? if ( ! function_usable('popen') OR FALSE === ($fp = @popen( - $this->mailpath.' -oi -f '.$this->clean_email($this->_headers['From']) - .' -t -r '.$this->clean_email($this->_headers['Return-Path']) + $this->mailpath.' -oi -f '.$this->clean_email($this->_headers['From']).' -t' , 'w')) ) // server probably has popen disabled, so nothing we can do to get a verbose error. { |