summaryrefslogtreecommitdiffstats
path: root/system/libraries/Image_lib.php
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-02-29 12:59:35 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-02-29 12:59:35 +0100
commit6b414d12c3ddeb09f62b0a1e111599390fa3f613 (patch)
treef1a1b4b2f200c93316064f4692b93f7f5ed45962 /system/libraries/Image_lib.php
parent0aa8c60ae7eee0122c42ae17d42fd5471a575743 (diff)
parentdb6066511bfc1a728049fdadaad14f1d10cd9796 (diff)
Merged in 2.1-stable 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));
}