diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-05-17 15:46:28 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-05-17 15:46:28 +0200 |
| commit | 918eaef728eaf49387083b39add7106e029fcfb4 (patch) | |
| tree | bd7ae7ad33977cf04cd44a735ccc1465ab7b4ffc /system/libraries/Image_lib.php | |
| parent | 0199f68db46d375af2d4cb831c679d3040601f25 (diff) | |
| parent | 324ef078dda5a3596444152ba49dd591a61adba6 (diff) | |
Merge branch 'release/2.1.1'
Diffstat (limited to 'system/libraries/Image_lib.php')
| -rw-r--r-- | system/libraries/Image_lib.php | 2 |
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; |