diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-12-01 13:14:18 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-12-01 13:14:18 +0100 |
| commit | 9e829e10e6f2d3786c358ca6c8c3ba2a149a6a40 (patch) | |
| tree | c38faf49e7274c3edfdb5ebb59ce80ac35fe57d8 /system/libraries/Email.php | |
| parent | efd856edce0b952c8a7a62ec953ae1baee77ff34 (diff) | |
| parent | 8db01f13809a92bac7bc95b02893175d7654d627 (diff) | |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'system/libraries/Email.php')
| -rw-r--r-- | system/libraries/Email.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 525a1277e..162cc7777 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1878,7 +1878,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' + $this->mailpath.' -oi -f '.escapeshellarg($this->clean_email($this->_headers['From'])).' -t' , 'w')) ) // server probably has popen disabled, so nothing we can do to get a verbose error. { |