@@ -280,14 +280,14 @@ class HookBootExitTestCase extends DrupalWebTestCase {
*/
functiontestHookBootExit(){
// Test with cache disabled. Boot and exit should always fire.
variable_set('cache',CACHE_DISABLED);
variable_set('cache',0);
$this->drupalGet('');
$calls=1;
$this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message',array(':type'=>'system_test',':message'=>'hook_boot'))->fetchField(),$calls,t('hook_boot called with disabled cache.'));
$this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message',array(':type'=>'system_test',':message'=>'hook_exit'))->fetchField(),$calls,t('hook_exit called with disabled cache.'));
// Test with normal cache. Boot and exit should be called.
variable_set('cache',CACHE_NORMAL);
variable_set('cache',1);
$this->drupalGet('');
$calls++;
$this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message',array(':type'=>'system_test',':message'=>'hook_boot'))->fetchField(),$calls,t('hook_boot called with normal cache.'));
'#description' => t('The maximum time an external cache can use an old version of a page.')
);
$directory = 'public://';
...
...
@@ -1653,7 +1660,7 @@ function system_performance_settings() {
'#description' => t('External resources can be optimized automatically, which can reduce both the size and number of requests made to your website.') . $disabled_message,
@@ -1995,7 +1995,7 @@ function system_update_7032() {
*/
function system_update_7033() {
if (variable_get('cache') == 2) {
variable_set('cache', CACHE_NORMAL);
variable_set('cache', 1);
return t('Aggressive caching was disabled and replaced with normal caching. Read the page caching section in default.settings.php for more information on how to enable similar functionality.');