diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-14 19:06:32 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-14 19:07:28 -0500 |
| commit | 30e9d2d6009eac0fb6bde1c7de3325dcc3527d6c (patch) | |
| tree | d6541c979062f62dd2c76ed8c2a9c5a0be892131 /phpBB/includes/cache/driver | |
| parent | 303fc646adf9104d7c82cf8bcebbc8fc0d328624 (diff) | |
| download | forums-30e9d2d6009eac0fb6bde1c7de3325dcc3527d6c.tar forums-30e9d2d6009eac0fb6bde1c7de3325dcc3527d6c.tar.gz forums-30e9d2d6009eac0fb6bde1c7de3325dcc3527d6c.tar.bz2 forums-30e9d2d6009eac0fb6bde1c7de3325dcc3527d6c.tar.xz forums-30e9d2d6009eac0fb6bde1c7de3325dcc3527d6c.zip | |
[ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
This reverts commit 303fc646adf9104d7c82cf8bcebbc8fc0d328624, reversing
changes made to 9c28470ad7b45c10ce3a32065650e4b17f9f27ea.
The correct fix should be to alter the container file name to start with
container_ prefix.
PHPBB3-11199
Diffstat (limited to 'phpBB/includes/cache/driver')
| -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 699402af84..b20c0064ea 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') === false && + 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 8b4ecb6cbf..98ac02b161 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') === false && + if (strpos($entry, 'container') !== 0 && strpos($entry, 'sql_') !== 0 && strpos($entry, 'data_') !== 0 && strpos($entry, 'ctpl_') !== 0 && |