diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-03-14 23:45:20 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-03-14 23:45:20 +0100 |
| commit | 822ee81f74c86e7c5d713583fa0d615edd5d564c (patch) | |
| tree | d5bc26d7cb32fc7927b1b05ed8c84268ee0c31dd | |
| parent | 395e68f490daf2d613dc921c59f090e58faf55f9 (diff) | |
| parent | 6db1ea6ff883de46a4bc2a0fd4c750cf8f15dfcb (diff) | |
Merge pull request #2940 from aanbar/zip_mtime_fix
Fixed issue with _get_mod_time
| -rw-r--r-- | system/libraries/Zip.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php index c634b1133..ab30a9019 100644 --- a/system/libraries/Zip.php +++ b/system/libraries/Zip.php @@ -133,7 +133,7 @@ class CI_Zip { protected function _get_mod_time($dir) { // filemtime() may return false, but raises an error for non-existing files - $date = file_exists($dir) ? filemtime($dir) : getdate($this->now); + $date = file_exists($dir) ? getdate(filemtime($dir)) : getdate($this->now); return array( 'file_mtime' => ($date['hours'] << 11) + ($date['minutes'] << 5) + $date['seconds'] / 2, diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 6f246e3a0..9795c3b9d 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -733,6 +733,7 @@ Bug fixes for 3.0 - Fixed a bug (#2364) - :doc:`Pagination Library <libraries/pagination>` appended the query string (if used) multiple times when there are successive calls to ``create_links()`` with no ``initialize()`` in between them. - Partially fixed a bug (#261) - UTF-8 class method ``clean_string()`` generating log messages and/or not producing the desired result due to an upstream bug in iconv. - Fixed a bug where ``CI_Xmlrpcs::parseRequest()`` could fail if ``$HTTP_RAW_POST_DATA`` is not populated. +- Fixed a bug in :doc:`Zip Library <libraries/zip>` internal method ``_get_mod_time()`` where it was not parsing result returned by ``filemtime()``. Version 2.1.4 ============= |