summaryrefslogtreecommitdiffstats
path: root/system/libraries/Image_lib.php
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-02-29 14:58:55 +0100
committerTimothy Warren <tim@timshomepage.net>2012-02-29 14:58:55 +0100
commit7980923d0c7e62fb545e3b750dfe5cec4a057b48 (patch)
treef8d4a382b897ccb34497a76798daac930fb338a3 /system/libraries/Image_lib.php
parent249842f2f79aaee7cdb02696f1b55e71e0623a08 (diff)
parenta5a2cfef881f4cb70729b854e2e86932f28c43f6 (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebird
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));
}