summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2011-12-15 10:03:05 +0100
committerAndrey Andreev <narf@bofh.bg>2011-12-15 10:03:05 +0100
commit320ddaa3d01c9d8ee6832fa25f9273e2588c63dd (patch)
tree4f3dc65452c6a3903678c283fdebf4128c8c64af /system/libraries
parentf7aed129051475b4baeeb549a764464560c9dd34 (diff)
parentffa86e89fbcaeb8726089e35c3c5ab5b01214b9c (diff)
Merge remote-tracking branch 'upstream/2.1-stable' into 2.1-stable
Diffstat (limited to 'system/libraries')
-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 8902f524d..7f905128b 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -208,7 +208,7 @@ class CI_Image_lib {
}
else
{
- if (strpos($this->new_image, '/') === FALSE)
+ if (strpos($this->new_image, '/') === FALSE AND strpos($this->new_image, '\\') === FALSE)
{
$this->dest_folder = $this->source_folder;
$this->dest_image = $this->new_image;