diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-04-03 19:21:39 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-04-03 19:21:39 +0200 |
| commit | 320d37c090cbc1497d3951f64da1c16e86bae609 (patch) | |
| tree | 51e1bf36e4d63e233e0b9b550420805d65548945 /system/libraries/Image_lib.php | |
| parent | 31cf46eaec3b4613d5b46f9caed8bdd346b581cc (diff) | |
| parent | 78f55772adb86b48d0d50572545c24c18f528ff9 (diff) | |
Merge upstream branch
Diffstat (limited to 'system/libraries/Image_lib.php')
| -rw-r--r-- | system/libraries/Image_lib.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index 86b77bf07..1ab8b23e0 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -251,7 +251,7 @@ class CI_Image_lib { } else { - if (strpos($this->new_image, '/') === FALSE AND strpos($this->new_image, '\\') === FALSE) + if (strpos($this->new_image, '/') === FALSE && strpos($this->new_image, '\\') === FALSE) { $full_dest_path = str_replace('\\', '/', realpath($this->new_image)); } @@ -1462,4 +1462,4 @@ class CI_Image_lib { } /* End of file Image_lib.php */ -/* Location: ./system/libraries/Image_lib.php */ +/* Location: ./system/libraries/Image_lib.php */
\ No newline at end of file |