summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-12-30 20:50:20 +0100
committerAndrey Andreev <narf@devilix.net>2015-12-30 20:50:20 +0100
commit9d84d3cb5cb2dd4044e57bfcbe81c423adab6d7c (patch)
tree371d06fffc5ce3d979a938dd08ed351ee259838e /system/libraries
parentf3ddda7ee890d5375f5c4fece118b7663dc465e2 (diff)
Fix #4343
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Email.php3
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.
{