diff options
| author | Andrey Andreev <narf@bofh.bg> | 2011-12-15 10:03:05 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2011-12-15 10:03:05 +0100 |
| commit | 320ddaa3d01c9d8ee6832fa25f9273e2588c63dd (patch) | |
| tree | 4f3dc65452c6a3903678c283fdebf4128c8c64af | |
| parent | f7aed129051475b4baeeb549a764464560c9dd34 (diff) | |
| parent | ffa86e89fbcaeb8726089e35c3c5ab5b01214b9c (diff) | |
Merge remote-tracking branch 'upstream/2.1-stable' into 2.1-stable
| -rw-r--r-- | system/libraries/Image_lib.php | 2 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 2 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; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 7a5fcf222..76a0bcb19 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -78,6 +78,7 @@ Change Log <li>Fixed a bug (#697) - A wrong array key was used in the Upload library to check for mime-types.</li> <li>Fixed a bug - form_open() compared $action against site_url() instead of base_url()</li> <li>Fixed a bug - CI_Upload::_file_mime_type() could've failed if mime_content_type() is used for the detection and returns FALSE.</li> + <li>Fixed a bug (#538) - Windows paths were ignored when using the <a href="libraries/image_lib.html">Image Manipulation Class</a> to create a new file.</li> </ul> |