diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-04-25 00:57:04 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-04-25 00:57:04 +0200 |
| commit | e6be7621854f59e00251036611ca19a159ac4319 (patch) | |
| tree | 5db508cc2528a5d597fc78b67c0391154943ea03 | |
| parent | 6a03ef29bef639b7d08cee0477f5ca62907fba7d (diff) | |
| parent | d593535a2a80c7e1a13e31b6fe94684b42e8a306 (diff) | |
Merge pull request #3801 from ivantcholakov/develop
Output cache: Fixing a wrong timestamp. Credits to khoggatt (CodeIgniter forum).
| -rw-r--r-- | system/core/Output.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/system/core/Output.php b/system/core/Output.php index 02f66936c..e7d559a1d 100644 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -674,7 +674,7 @@ class CI_Output { $cache_info = unserialize($match[1]); $expire = $cache_info['expire']; - $last_modified = filemtime($cache_path); + $last_modified = filemtime($filepath); // Has the file expired? if ($_SERVER['REQUEST_TIME'] >= $expire && is_really_writable($cache_path)) diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index ae8dde6f9..cda5d319e 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -20,6 +20,7 @@ Bug fixes for 3.0.1 - Fixed a bug (#3773) - ``db_select()`` didn't work for MySQL with the PDO :doc:`Database <database/index>` driver. - Fixed a bug (#3771) - :doc:`Form Validation Library <libraries/form_validation>` was looking for a 'form_validation_' prefix when trying to translate field name labels. - Fixed a bug (#3787) - :doc:`FTP Library <libraries/ftp>` method ``delete_dir()`` failed when the target has subdirectories. +- Fixed a bug (#3801) - :doc:`Output Library <libraries/output>` method ``_display_cache()`` incorrectly looked for the last modified time of a directory instead of the cache file. Version 3.0.0 ============= |