summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-03-14 23:45:20 +0100
committerAndrey Andreev <narf@devilix.net>2014-03-14 23:45:20 +0100
commit822ee81f74c86e7c5d713583fa0d615edd5d564c (patch)
treed5bc26d7cb32fc7927b1b05ed8c84268ee0c31dd /system
parent395e68f490daf2d613dc921c59f090e58faf55f9 (diff)
parent6db1ea6ff883de46a4bc2a0fd4c750cf8f15dfcb (diff)
Merge pull request #2940 from aanbar/zip_mtime_fix
Fixed issue with _get_mod_time
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Zip.php2
1 files changed, 1 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,