summaryrefslogtreecommitdiffstats
path: root/system/libraries/Image_lib.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-29 13:44:27 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-29 13:44:27 +0100
commit4a64a223da13a8fb1bf2720f068e55a7967a4486 (patch)
tree2986fca0191318f3bcff379fb7d464814a83843a /system/libraries/Image_lib.php
parent8bbb38983b8052e32063244941315fe81199e024 (diff)
parent002b4be248e448227a718e6f7d9ee39ccc575745 (diff)
Merge upstream branch
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));
}