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/Image_lib.php | |
| parent | efd856edce0b952c8a7a62ec953ae1baee77ff34 (diff) | |
| parent | 8db01f13809a92bac7bc95b02893175d7654d627 (diff) | |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'system/libraries/Image_lib.php')
| -rw-r--r-- | system/libraries/Image_lib.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index 7ec8ba365..06cdde0b8 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -886,7 +886,7 @@ class CI_Image_lib { } } - $cmd .= escapeshellarg($this->full_src_path).' '.escapeshellarg($this->full_dst_path).' 2>&1'; + $cmd .= ' '.escapeshellarg($this->full_src_path).' '.escapeshellarg($this->full_dst_path).' 2>&1'; $retval = 1; // exec() might be disabled |