diff options
author | Timothy Warren <tim@timshomepage.net> | 2012-03-02 15:29:27 +0100 |
---|---|---|
committer | Timothy Warren <tim@timshomepage.net> | 2012-03-02 15:29:27 +0100 |
commit | 6a3bda6a1fee45635f66f4e22d288f73334e9e48 (patch) | |
tree | 9a4a785e31daa46465e08a0b60ba7d076df04d6a /system/libraries/Image_lib.php | |
parent | 2d04624cb59d5852f8e61d610ab822252cad685a (diff) | |
parent | 06400c0397793132e7517a1e414d104800e16667 (diff) |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter 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 5ea830fb1..9826eabdd 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -251,7 +251,7 @@ class CI_Image_lib { } else { - if (function_exists('realpath') && @realpath($this->new_image) !== FALSE) + if (strpos($this->new_image, '/') === FALSE AND strpos($this->new_image, '\\') === FALSE) { $full_dest_path = str_replace('\\', '/', realpath($this->new_image)); } |