diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/libraries/Image_lib.php | 5 | ||||
| -rw-r--r-- | system/libraries/Zip.php | 2 |
2 files changed, 5 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; } |