diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-11-12 10:46:21 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-11-12 10:46:21 +0100 |
| commit | bf641a7f31f87eb7b88437214315872bff36ae84 (patch) | |
| tree | 6e850dff6caf7e939ee614a1dbeb5ba4f1deb002 /phpBB/includes/cache/driver/file.php | |
| parent | 9bc9ac281af9f194d73160ae3545105f24db5395 (diff) | |
| parent | 5a5e507a14084b08e41c4d2f86f2fb6700e68eb5 (diff) | |
| download | forums-bf641a7f31f87eb7b88437214315872bff36ae84.tar forums-bf641a7f31f87eb7b88437214315872bff36ae84.tar.gz forums-bf641a7f31f87eb7b88437214315872bff36ae84.tar.bz2 forums-bf641a7f31f87eb7b88437214315872bff36ae84.tar.xz forums-bf641a7f31f87eb7b88437214315872bff36ae84.zip | |
Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (31 commits)
[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/11152] Basic tests for the container functions
[ticket/11152] Compile the install container
[ticket/11152] Throw error if services.yml is missing
[ticket/11152] Remove old container processor calls
[ticket/11152] Use realpath in container extensions consistently
[ticket/11152] Rename collection to collection_pass
[ticket/11152] Remove @api docblocks
[ticket/11152] Create separate function for debug-dependent container
[ticket/11152] Change phpbb_di_pass_cron to generic phpbb_di_pass_collection
[ticket/11152] Convert cron_task_collection to generic di_service_collection
[ticket/11152] Use relative root path in container, one dumped container per path
[ticket/11152] Move container functions to a separate function file
[feature/compiled-dic] Rename $phpEx to $php_ext in new code
[feature/compiled-dic] Use an absolute path for core.root_path parameter
[feature/compiled-dic] Update the composer.lock file
[feature/compiled-dic] Purge cache to make ext services available right away
[feature/compiled-dic] Fix root path when container is created after install
[feature/compiled-dic] Remove old test
...
Diffstat (limited to 'phpBB/includes/cache/driver/file.php')
| -rw-r--r-- | phpBB/includes/cache/driver/file.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/cache/driver/file.php b/phpBB/includes/cache/driver/file.php index ced45b29ea..23063a1a28 100644 --- a/phpBB/includes/cache/driver/file.php +++ b/phpBB/includes/cache/driver/file.php @@ -214,7 +214,11 @@ class phpbb_cache_driver_file extends phpbb_cache_driver_base while (($entry = readdir($dir)) !== false) { - if (strpos($entry, 'sql_') !== 0 && strpos($entry, 'data_') !== 0 && strpos($entry, 'ctpl_') !== 0 && strpos($entry, 'tpl_') !== 0) + if (strpos($entry, 'container') !== 0 && + strpos($entry, 'sql_') !== 0 && + strpos($entry, 'data_') !== 0 && + strpos($entry, 'ctpl_') !== 0 && + strpos($entry, 'tpl_') !== 0) { continue; } |