diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-04-06 20:41:58 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-04-06 20:41:58 +0200 |
| commit | d1587defeb0304755d9a937aa688ee82098de246 (patch) | |
| tree | 54904c545b9d6054d49df8f1cbb0fb8f28727495 /system/libraries/Image_lib.php | |
| parent | fd9e46e852d073ae6fb8680f26e9825805104e1c (diff) | |
| parent | ea09a8a5552f2aacdeab0c88a605fe44047ebd0a (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 |