diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-15 09:07:41 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-15 09:07:41 -0500 |
| commit | c30b38ba10681bb9f4f5aa0a668388b3e7bd084e (patch) | |
| tree | 412bd22f10059e6dc317d3a53a7078235092d14a | |
| parent | f16f33c5ed6aa03ba6c6100b6ae1ab9ab27d3f8b (diff) | |
| parent | a0cc2878a365e2f36728f3b102c131cd055f6874 (diff) | |
| download | forums-c30b38ba10681bb9f4f5aa0a668388b3e7bd084e.tar forums-c30b38ba10681bb9f4f5aa0a668388b3e7bd084e.tar.gz forums-c30b38ba10681bb9f4f5aa0a668388b3e7bd084e.tar.bz2 forums-c30b38ba10681bb9f4f5aa0a668388b3e7bd084e.tar.xz forums-c30b38ba10681bb9f4f5aa0a668388b3e7bd084e.zip | |
Merge PR #1088 branch 'igorw/ticket/11199' into develop
* igorw/ticket/11199:
[ticket/11199] Match cache purge container files against container_*
[ticket/11199] Purge dumped container correctly on cache purge.
| -rw-r--r-- | phpBB/includes/cache/driver/file.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/cache/driver/memory.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_container.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/cache/driver/file.php b/phpBB/includes/cache/driver/file.php index b20c0064ea..32bdb1918a 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_') !== 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 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 && diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php index 843207db84..8014574443 100644 --- a/phpBB/includes/functions_container.php +++ b/phpBB/includes/functions_container.php @@ -138,5 +138,5 @@ function phpbb_create_dumped_container_unless_debug(array $extensions, array $pa function phpbb_container_filename($phpbb_root_path, $php_ext) { $filename = str_replace(array('/', '.'), array('slash', 'dot'), $phpbb_root_path); - return $phpbb_root_path . 'cache/' . $filename . '_container.' . $php_ext; + return $phpbb_root_path . 'cache/container_' . $filename . '.' . $php_ext; } |