diff options
author | Mike Funk <mfunk@xulonpress.com> | 2012-03-07 19:29:37 +0100 |
---|---|---|
committer | Mike Funk <mfunk@xulonpress.com> | 2012-03-07 19:29:37 +0100 |
commit | 1909b5b1dd5e2d6847cbe4a87a0aadd52b506681 (patch) | |
tree | 8aaf0c86aa49dc0bacd55daeb2144d40c37ae8e0 /system/libraries/Image_lib.php | |
parent | a90b1f2f89a41b2fe061f5fdd3f84f08b961a887 (diff) | |
parent | 1d571971be8be78a92d31aad27dda4009770043f (diff) |
merged from develop, fixed conflict in user guide.
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)); } |