Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #1259096 by Akaoni: cache Bin cache_path() is never cleaned up.

merge-requests/26/head
Dries Buytaert 2011-08-26 10:15:10 +01:00
parent d70426b221
commit 98235359be
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/common.inc
View File

@ -7137,7 +7137,7 @@ function drupal_flush_all_caches() {
// Don't clear cache_form - in-progress form submissions may break. // Don't clear cache_form - in-progress form submissions may break.
// Ordered so clearing the page cache will always be the last action. // Ordered so clearing the page cache will always be the last action.
$core = array('cache', 'cache_filter', 'cache_bootstrap', 'cache_page'); $core = array('cache', 'cache_path', 'cache_filter', 'cache_bootstrap', 'cache_page');
$cache_tables = array_merge(module_invoke_all('flush_caches'), $core); $cache_tables = array_merge(module_invoke_all('flush_caches'), $core);
foreach ($cache_tables as $table) { foreach ($cache_tables as $table) {
cache_clear_all('*', $table, TRUE); cache_clear_all('*', $table, TRUE);

21
modules/simpletest/tests/cache.test
View File

@ -310,6 +310,27 @@ class CacheClearCase extends CacheTestCase {
|| $this->checkCacheExists('test_cid_clear3', $this->default_value), || $this->checkCacheExists('test_cid_clear3', $this->default_value),
t('All cache entries removed when the array exceeded the cache clear threshold.')); t('All cache entries removed when the array exceeded the cache clear threshold.'));
} }
/**
* Test drupal_flush_all_caches().
*/
function testFlushAllCaches() {
// Create cache entries for each flushed cache bin.
$bins = array('cache', 'cache_filter', 'cache_page', 'cache_boostrap', 'cache_path');
$bins = array_merge(module_invoke_all('flush_caches'), $bins);
foreach ($bins as $id => $bin) {
$id = 'test_cid_clear' . $id;
cache_set($id, $this->default_value, $bin);
}
// Remove all caches then make sure that they are cleared.
drupal_flush_all_caches();
foreach ($bins as $id => $bin) {
$id = 'test_cid_clear' . $id;
$this->assertFalse($this->checkCacheExists($id, $this->default_value, $bin), t('All cache entries removed from @bin.', array('@bin' => $bin)));
}
}
} }
/** /**

2
modules/system/system.module
View File

@ -3004,7 +3004,7 @@ function system_cron() {
} }
} }
$core = array('cache', 'cache_filter', 'cache_page', 'cache_form', 'cache_menu'); $core = array('cache', 'cache_path', 'cache_filter', 'cache_page', 'cache_form', 'cache_menu');
$cache_tables = array_merge(module_invoke_all('flush_caches'), $core); $cache_tables = array_merge(module_invoke_all('flush_caches'), $core);
foreach ($cache_tables as $table) { foreach ($cache_tables as $table) {
cache_clear_all(NULL, $table); cache_clear_all(NULL, $table);