diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-11-14 11:33:24 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-11-14 11:33:24 -0600 |
| commit | d2187424da6ff2e0d4a69a6e21bac7e92f68335a (patch) | |
| tree | ee099178886dd3a6e737f2dee08bd6312bf25ce1 /phpBB/includes/cache/driver | |
| parent | 7948aaa78ed7e543a0773ee1a858ef45f5e5a5bf (diff) | |
| parent | 9c28470ad7b45c10ce3a32065650e4b17f9f27ea (diff) | |
| download | forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.tar forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.tar.gz forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.tar.bz2 forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.tar.xz forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
phpBB/common.php
phpBB/config/services.yml
Diffstat (limited to 'phpBB/includes/cache/driver')
| -rw-r--r-- | phpBB/includes/cache/driver/file.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/cache/driver/memory.php | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/includes/cache/driver/file.php b/phpBB/includes/cache/driver/file.php index f64a9e3ea8..b20c0064ea 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; } diff --git a/phpBB/includes/cache/driver/memory.php b/phpBB/includes/cache/driver/memory.php index e0771ab1d3..98ac02b161 100644 --- a/phpBB/includes/cache/driver/memory.php +++ b/phpBB/includes/cache/driver/memory.php @@ -162,7 +162,11 @@ abstract class phpbb_cache_driver_memory 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; } |