diff options
| -rw-r--r-- | system/libraries/Image_lib.php | 5 | ||||
| -rw-r--r-- | system/libraries/Zip.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index dbe5cbbd1..a07557f61 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -835,7 +835,10 @@ class CI_Image_lib { imagedestroy($dst_img); imagedestroy($src_img); - chmod($this->full_dst_path, $this->file_permissions); + if ($this->dynamic_output !== TRUE) + { + chmod($this->full_dst_path, $this->file_permissions); + } return TRUE; } diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php index bc557bfe4..6ed6d5242 100644 --- a/system/libraries/Zip.php +++ b/system/libraries/Zip.php @@ -366,7 +366,7 @@ class CI_Zip { while (FALSE !== ($file = readdir($fp))) { - if ($file[0] === '.') + if ($file === '.' OR $file === '..') { continue; } diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index b7ebe7aa3..8aede9406 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -37,6 +37,7 @@ Release Date: Not Released - Removed previously deprecated *Cart Library*. - Removed previously deprecated *Javascript Library* (it was always experimental in the first place). - Added UNIX socket connection support to :doc:`Session Library <libraries/sessions>` 'redis' driver. + - Updated :doc:`ZIP Library <libraries/zip>` method ``read_dir()`` to include hidden (dot-prefixed) files. - :doc:`Cache Library <libraries/caching>` changes include: |