diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-11-16 01:23:24 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-11-16 01:23:24 +0100 |
| commit | 423c79e106e1977d8d1085f6cb7ac9b63be7ec63 (patch) | |
| tree | 75bc997bc880041ec4124f629c54af936ce63e7b /phpBB/includes/cache/driver/memory.php | |
| parent | a23eebdb7bb60c4b910357c1e948b97d48071d6a (diff) | |
| parent | f5536354917d0ae9dd5a1f7c842f175478b8f904 (diff) | |
| download | forums-423c79e106e1977d8d1085f6cb7ac9b63be7ec63.tar forums-423c79e106e1977d8d1085f6cb7ac9b63be7ec63.tar.gz forums-423c79e106e1977d8d1085f6cb7ac9b63be7ec63.tar.bz2 forums-423c79e106e1977d8d1085f6cb7ac9b63be7ec63.tar.xz forums-423c79e106e1977d8d1085f6cb7ac9b63be7ec63.zip | |
Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (22 commits)
[ticket/11206] Remove includes to non-existent files from download/file.php
[ticket/11205] Fix merge conflict in readme.html.
[ticket/11202] Check response success before content assertions.
[ticket/11204] Reindent.
[ticket/11198] Remove additional asterix as /** is doc-block only
[ticket/11200] Add a reminder comment.
[ticket/11202] Custom message does not make sense here, delete it.
[ticket/11202] Check response success before content assertions.
[ticket/11202] Add a heuristic function to check for response success.
[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/11190-develop] Functional tests purge cache before running.
...
Conflicts:
tests/test_framework/phpbb_database_test_connection_manager.php
Diffstat (limited to 'phpBB/includes/cache/driver/memory.php')
| -rw-r--r-- | phpBB/includes/cache/driver/memory.php | 2 |
1 files changed, 1 insertions, 1 deletions
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 && |