diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-11-15 18:21:38 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-11-15 18:21:38 +0100 |
| commit | 4db6ded8f0bccdd8684bd869d4779bd98bff69de (patch) | |
| tree | f9e5c48403a186c95be64ef284efe07a0d91678a /phpBB/includes/cache | |
| parent | 60d831c392a78fceb4ae737a3141573c4b2427d8 (diff) | |
| parent | ceae276cd6fb82ed2b4403cea0cb54f3be5a5b6d (diff) | |
| download | forums-4db6ded8f0bccdd8684bd869d4779bd98bff69de.tar forums-4db6ded8f0bccdd8684bd869d4779bd98bff69de.tar.gz forums-4db6ded8f0bccdd8684bd869d4779bd98bff69de.tar.bz2 forums-4db6ded8f0bccdd8684bd869d4779bd98bff69de.tar.xz forums-4db6ded8f0bccdd8684bd869d4779bd98bff69de.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2
* 'develop' of https://github.com/phpbb/phpbb3:
[ticket/11198] Remove additional asterix as /** is doc-block only
[ticket/11200] Add a reminder comment.
[ticket/11200] Make cache available during container construction
[ticket/11199] Match cache purge container files against container_*
[ticket/11199] Purge dumped container correctly on cache purge.
[ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
[ticket/11199] Cache purge does not remove dumped container
[ticket/11198] Store the swapping partners in vars and simplify the logic
[ticket/11198] Correctly set links after an item is moved up/down with AJAX
[ticket/11197] Prefix the css classes for the small arrow with "arrow"
[ticket/10879] Remove arrow icon from attachment link in editor
[ticket/11195] Condense logic, remove improperly formatted if()
[ticket/11194] Service tag data is stored in an array so access it correctly
[ticket/11193] Instantiate a single collection_pass for all collections
[ticket/11190-develop] Functional tests purge cache before running.
[ticket/11190] Functional tests purge cache before running.
Diffstat (limited to 'phpBB/includes/cache')
| -rw-r--r-- | phpBB/includes/cache/driver/file.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/cache/driver/memory.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/cache/driver/file.php b/phpBB/includes/cache/driver/file.php index b20c0064ea..32bdb1918a 100644 --- a/phpBB/includes/cache/driver/file.php +++ b/phpBB/includes/cache/driver/file.php @@ -214,7 +214,7 @@ class phpbb_cache_driver_file extends phpbb_cache_driver_base while (($entry = readdir($dir)) !== false) { - if (strpos($entry, 'container') !== 0 && + if (strpos($entry, 'container_') !== 0 && strpos($entry, 'sql_') !== 0 && strpos($entry, 'data_') !== 0 && strpos($entry, 'ctpl_') !== 0 && diff --git a/phpBB/includes/cache/driver/memory.php b/phpBB/includes/cache/driver/memory.php index 98ac02b161..1ea9a3e9e7 100644 --- a/phpBB/includes/cache/driver/memory.php +++ b/phpBB/includes/cache/driver/memory.php @@ -162,7 +162,7 @@ abstract class phpbb_cache_driver_memory extends phpbb_cache_driver_base while (($entry = readdir($dir)) !== false) { - if (strpos($entry, 'container') !== 0 && + if (strpos($entry, 'container_') !== 0 && strpos($entry, 'sql_') !== 0 && strpos($entry, 'data_') !== 0 && strpos($entry, 'ctpl_') !== 0 && |