summaryrefslogtreecommitdiffstats
path: root/system/libraries/Image_lib.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-29 13:47:03 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-29 13:47:03 +0100
commit18c9ea77c7c68be38ea1b995cccff18ee2e6acb4 (patch)
treeee9a609cd904ad0f7f4c9923436cc204a5e3ca26 /system/libraries/Image_lib.php
parent15db36f69cc4e8b7cd2ca78512b2784de7e6cb5e (diff)
parent002b4be248e448227a718e6f7d9ee39ccc575745 (diff)
Merge remote-tracking branch 'upstream/develop' into develop-db-oci8
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));
}