summaryrefslogtreecommitdiffstats
path: root/system/libraries/Image_lib.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-01 18:23:02 +0100
committerAndrey Andreev <narf@bofh.bg>2012-03-01 18:23:02 +0100
commit8e22cfdc2fe626bed2a3e570bc71f25d61d6546c (patch)
tree8fac11c939596396b9b3fb4aae83e8cf58e147dd /system/libraries/Image_lib.php
parent3793517a9c5c7f2c829d5d56bc5754606fa421de (diff)
parentea3eec9f670ea861a65a3e251d8c518ff47e2506 (diff)
Merge upstream changes
Diffstat (limited to 'system/libraries/Image_lib.php')
-rw-r--r--system/libraries/Image_lib.php2
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));
}