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

Reworked calls to remove nesting of values

8.0.x
Greg Dunlap 2011-12-08 09:40:48 +01:00
parent 262c8781cf
commit 5d3e3a1fc3
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/includes/bootstrap.inc
View File

@ -2311,7 +2311,7 @@ function _drupal_bootstrap_page_cache() {
else { else {
drupal_bootstrap(DRUPAL_BOOTSTRAP_VARIABLES, FALSE); drupal_bootstrap(DRUPAL_BOOTSTRAP_VARIABLES, FALSE);
$config = config('system.performance'); $config = config('system.performance');
$cache_enabled = $config->get('caching.cache'); $cache_enabled = $config->get('cache');
} }
drupal_block_denied(ip_address()); drupal_block_denied(ip_address());
// If there is no session cookie and cache is enabled (or forced), try // If there is no session cookie and cache is enabled (or forced), try

2
core/includes/cache.inc
View File

@ -470,7 +470,7 @@ class DrupalDatabaseCache implements DrupalCacheInterface {
// in session.inc. If the data is permanent or we're not enforcing a minimum // in session.inc. If the data is permanent or we're not enforcing a minimum
// cache lifetime always return the cached data. // cache lifetime always return the cached data.
$config = config('system.performance'); $config = config('system.performance');
if ($cache->expire != CACHE_PERMANENT && $config->get('caching.cache_lifetime') && $user->cache > $cache->created) { if ($cache->expire != CACHE_PERMANENT && $config->get('cache_lifetime') && $user->cache > $cache->created) {
// This cache data is too old and thus not valid for us, ignore it. // This cache data is too old and thus not valid for us, ignore it.
return FALSE; return FALSE;
} }

2
core/modules/block/block.module
View File

@ -998,7 +998,7 @@ function block_form_system_performance_settings_alter(&$form, &$form_state) {
$form['caching']['block_cache'] = array( $form['caching']['block_cache'] = array(
'#type' => 'checkbox', '#type' => 'checkbox',
'#title' => t('Cache blocks'), '#title' => t('Cache blocks'),
'#default_value' => $config->get('caching.block_cache'), '#default_value' => $config->get('block_cache'),
'#disabled' => $disabled, '#disabled' => $disabled,
'#description' => $disabled ? t('Block caching is inactive because you have enabled modules defining content access restrictions.') : NULL, '#description' => $disabled ? t('Block caching is inactive because you have enabled modules defining content access restrictions.') : NULL,
'#weight' => -1, '#weight' => -1,

26
core/modules/system/system.admin.inc
View File

@ -1662,7 +1662,7 @@ function system_performance_settings($form, &$form_state) {
$form['caching']['cache'] = array( $form['caching']['cache'] = array(
'#type' => 'checkbox', '#type' => 'checkbox',
'#title' => t('Cache pages for anonymous users'), '#title' => t('Cache pages for anonymous users'),
'#default_value' => $config->get('caching.cache'), '#default_value' => $config->get('cache'),
'#weight' => -2, '#weight' => -2,
); );
$period = drupal_map_assoc(array(0, 60, 180, 300, 600, 900, 1800, 2700, 3600, 10800, 21600, 32400, 43200, 86400), 'format_interval'); $period = drupal_map_assoc(array(0, 60, 180, 300, 600, 900, 1800, 2700, 3600, 10800, 21600, 32400, 43200, 86400), 'format_interval');
@ -1670,14 +1670,14 @@ function system_performance_settings($form, &$form_state) {
$form['caching']['cache_lifetime'] = array( $form['caching']['cache_lifetime'] = array(
'#type' => 'select', '#type' => 'select',
'#title' => t('Minimum cache lifetime'), '#title' => t('Minimum cache lifetime'),
'#default_value' => $config->get('caching.cache_lifetime'), '#default_value' => $config->get('cache_lifetime'),
'#options' => $period, '#options' => $period,
'#description' => t('Cached pages will not be re-created until at least this much time has elapsed.'), '#description' => t('Cached pages will not be re-created until at least this much time has elapsed.'),
); );
$form['caching']['page_cache_maximum_age'] = array( $form['caching']['page_cache_maximum_age'] = array(
'#type' => 'select', '#type' => 'select',
'#title' => t('Expiration of cached pages'), '#title' => t('Expiration of cached pages'),
'#default_value' => $config->get('caching.page_cache_maximum_age'), '#default_value' => $config->get('page_cache_maximum_age'),
'#options' => $period, '#options' => $period,
'#description' => t('The maximum time an external cache can use an old version of a page.'), '#description' => t('The maximum time an external cache can use an old version of a page.'),
); );
@ -1696,24 +1696,24 @@ function system_performance_settings($form, &$form_state) {
'#description' => t('External resources can be optimized automatically, which can reduce both the size and number of requests made to your website.') . $disabled_message, '#description' => t('External resources can be optimized automatically, which can reduce both the size and number of requests made to your website.') . $disabled_message,
); );
$js_hide = $config->get('caching.cache') ? '' : ' class="js-hide"'; $js_hide = $config->get('cache') ? '' : ' class="js-hide"';
$form['bandwidth_optimization']['page_compression'] = array( $form['bandwidth_optimization']['page_compression'] = array(
'#type' => 'checkbox', '#type' => 'checkbox',
'#title' => t('Compress cached pages.'), '#title' => t('Compress cached pages.'),
'#default_value' => $config->get('bandwidth_optimization.page_compression'), '#default_value' => $config->get('page_compression'),
'#prefix' => '<div id="page-compression-wrapper"' . $js_hide . '>', '#prefix' => '<div id="page-compression-wrapper"' . $js_hide . '>',
'#suffix' => '</div>', '#suffix' => '</div>',
); );
$form['bandwidth_optimization']['preprocess_css'] = array( $form['bandwidth_optimization']['preprocess_css'] = array(
'#type' => 'checkbox', '#type' => 'checkbox',
'#title' => t('Aggregate and compress CSS files.'), '#title' => t('Aggregate and compress CSS files.'),
'#default_value' => $config->get('bandwidth_optimization.preprocess_css'), '#default_value' => $config->get('preprocess_css'),
'#disabled' => $disabled, '#disabled' => $disabled,
); );
$form['bandwidth_optimization']['preprocess_js'] = array( $form['bandwidth_optimization']['preprocess_js'] = array(
'#type' => 'checkbox', '#type' => 'checkbox',
'#title' => t('Aggregate JavaScript files.'), '#title' => t('Aggregate JavaScript files.'),
'#default_value' => $config->get('bandwidth_optimization.preprocess_js'), '#default_value' => $config->get('preprocess_js'),
'#disabled' => $disabled, '#disabled' => $disabled,
); );
@ -1740,12 +1740,12 @@ function system_performance_settings($form, &$form_state) {
*/ */
function system_performance_settings_submit($form, &$form_state) { function system_performance_settings_submit($form, &$form_state) {
$config = config('system.performance'); $config = config('system.performance');
$config->set('caching.cache', $form_state['values']['cache']); $config->set('cache', $form_state['values']['cache']);
$config->set('caching.cache_lifetime', $form_state['values']['cache_lifetime']); $config->set('cache_lifetime', $form_state['values']['cache_lifetime']);
$config->set('caching.page_cache_maximum_age', $form_state['values']['page_cache_maximum_age']); $config->set('page_cache_maximum_age', $form_state['values']['page_cache_maximum_age']);
$config->set('bandwidth_optimization.page_compression', $form_state['values']['page_compression']); $config->set('page_compression', $form_state['values']['page_compression']);
$config->set('bandwidth_optimization.preprocess_css', $form_state['values']['preprocess_css']); $config->set('preprocess_css', $form_state['values']['preprocess_css']);
$config->set('bandwidth_optimization.preprocess_js', $form_state['values']['preprocess_js']); $config->set('preprocess_js', $form_state['values']['preprocess_js']);
$config->save(); $config->save();
} }