diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-04-03 19:54:49 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-04-03 19:54:49 +0200 |
| commit | fd105ab7f05e64c0d9188e43c6fd6a2bb2c6cf7f (patch) | |
| tree | d16dc16ae5e81f6171a18b3278d48038406937bd /system/libraries/Image_lib.php | |
| parent | 5b46f42d654e7474a47ecfd9f7dafece98ee668e (diff) | |
| parent | ab1d568b7b7bce779cd00c90cd99c6f43747575b (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-postgre
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 |