diff options
author | David King <imkingdavid@gmail.com> | 2012-11-14 18:54:06 -0500 |
---|---|---|
committer | David King <imkingdavid@gmail.com> | 2012-11-14 18:54:06 -0500 |
commit | 303fc646adf9104d7c82cf8bcebbc8fc0d328624 (patch) | |
tree | a7b614263bc68e4f26fb0399bada5de5ff954eb1 /phpBB/includes/cache | |
parent | 9c28470ad7b45c10ce3a32065650e4b17f9f27ea (diff) | |
parent | d982d432eb3bef8040b04d0514bc80c346faf618 (diff) | |
download | forums-303fc646adf9104d7c82cf8bcebbc8fc0d328624.tar forums-303fc646adf9104d7c82cf8bcebbc8fc0d328624.tar.gz forums-303fc646adf9104d7c82cf8bcebbc8fc0d328624.tar.bz2 forums-303fc646adf9104d7c82cf8bcebbc8fc0d328624.tar.xz forums-303fc646adf9104d7c82cf8bcebbc8fc0d328624.zip |
Merge remote-tracking branch 'marc1706/ticket/11199' into develop
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/11199:
[ticket/11199] Cache purge does not remove dumped container
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..699402af84 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') === false && 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..8b4ecb6cbf 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') === false && strpos($entry, 'sql_') !== 0 && strpos($entry, 'data_') !== 0 && strpos($entry, 'ctpl_') !== 0 && |