diff -u b/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc --- b/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -1679,25 +1679,28 @@ '#title' => t('Caching'), ); - $form['caching']['cache'] = config_form_element($form, $form_state, $config, 'cache', array( + $form['caching']['cache'] = array( '#type' => 'checkbox', '#title' => t('Cache pages for anonymous users'), + '#config' => 'system.performance:cache', '#weight' => -2, - )); + ); $period = drupal_map_assoc(array(0, 60, 180, 300, 600, 900, 1800, 2700, 3600, 10800, 21600, 32400, 43200, 86400), 'format_interval'); $period[0] = '<' . t('none') . '>'; - $form['caching']['cache_lifetime'] = config_form_element($form, $form_state, $config, 'cache_lifetime', array( + $form['caching']['cache_lifetime'] = array( '#type' => 'select', '#title' => t('Minimum cache lifetime'), + '#config' => 'system.performance:cache_lifetime', '#options' => $period, '#description' => t('Cached pages will not be re-created until at least this much time has elapsed.'), - )); - $form['caching']['page_cache_maximum_age'] = config_form_element($form, $form_state, $config, 'page_cache_maximum_age', array( + ); + $form['caching']['page_cache_maximum_age'] = array( '#type' => 'select', '#title' => t('Expiration of cached pages'), + '#config' => 'system.performance:page_cache_maximum_age', '#options' => $period, '#description' => t('The maximum time an external cache can use an old version of a page.'), - )); + ); $directory = 'public://'; $is_writable = is_dir($directory) && is_writable($directory); @@ -1714,22 +1717,25 @@ ); $js_hide = $config->get('cache') ? '' : ' class="js-hide"'; - $form['bandwidth_optimization']['page_compression'] = config_form_element($form, $form_state, $config, 'page_compression', array( + $form['bandwidth_optimization']['page_compression'] = array( '#type' => 'checkbox', '#title' => t('Compress cached pages.'), + '#config' => 'system.performance:page_compression', '#prefix' => '