diff --git a/core/cron.php b/core/cron.php index fa9aa14..301047a 100644 --- a/core/cron.php +++ b/core/cron.php @@ -16,7 +16,7 @@ define('DRUPAL_ROOT', getcwd()); include_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); -if (!isset($_GET['cron_key']) || variable_get('cron_key', 'drupal') != $_GET['cron_key']) { +if (!isset($_GET['cron_key']) || config('system.cron')->get('cron_key') != $_GET['cron_key']) { watchdog('cron', 'Cron could not run because an invalid key was used.', array(), WATCHDOG_NOTICE); drupal_access_denied(); } diff --git a/core/modules/aggregator/aggregator.test b/core/modules/aggregator/aggregator.test index 61ad16b..ff41561 100644 --- a/core/modules/aggregator/aggregator.test +++ b/core/modules/aggregator/aggregator.test @@ -798,7 +798,7 @@ class AggregatorCronTestCase extends AggregatorTestCase { public function testCron() { // Create feed and test basic updating on cron. global $base_url; - $key = variable_get('cron_key', 'drupal'); + $key = config('system.cron')->get('cron_key'); $this->createSampleNodes(); $feed = $this->createFeed(); $this->drupalGet($base_url . '/core/cron.php', array('external' => TRUE, 'query' => array('cron_key' => $key))); diff --git a/core/modules/simpletest/drupal_web_test_case.php b/core/modules/simpletest/drupal_web_test_case.php index 540dc0e..6805170 100644 --- a/core/modules/simpletest/drupal_web_test_case.php +++ b/core/modules/simpletest/drupal_web_test_case.php @@ -2186,7 +2186,7 @@ class DrupalWebTestCase extends DrupalTestCase { * Runs cron in the Drupal installed by Simpletest. */ protected function cronRun() { - $this->drupalGet($GLOBALS['base_url'] . '/core/cron.php', array('external' => TRUE, 'query' => array('cron_key' => variable_get('cron_key', 'drupal')))); + $this->drupalGet($GLOBALS['base_url'] . '/core/cron.php', array('external' => TRUE, 'query' => array('cron_key' => config('system.cron')->get('cron_key')))); } /** diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc index aac0c3d..fbad0ca 100644 --- a/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -1569,7 +1569,7 @@ function system_site_information_settings_validate($form, &$form_state) { * @see system_settings_form() * @ingroup forms */ -function system_cron_settings() { +function system_cron_settings($form, &$form_state) { $form['description'] = array( '#markup' => '
' . t('Cron takes care of running periodic tasks like checking for updates and indexing content for search.') . '
', ); @@ -1588,11 +1588,29 @@ function system_cron_settings() { $form['cron']['cron_safe_threshold'] = array( '#type' => 'select', '#title' => t('Run cron every'), - '#default_value' => variable_get('cron_safe_threshold', DRUPAL_CRON_DEFAULT_THRESHOLD), + '#default_value' => config('system.cron')->get('cron_safe_threshold'), '#options' => array(0 => t('Never')) + drupal_map_assoc(array(3600, 10800, 21600, 43200, 86400, 604800), 'format_interval'), ); + $form_state['config']['cron_safe_threshold'] = array( + 'name' => 'system.cron', + 'path' => 'cron_safe_threshold', + ); - return system_settings_form($form); + $form['submit'] = array('#type' => 'submit', '#value' => t('Save configuration')); + return $form; +} + +/** + * Form builder submit handler; Handle submission for cron settings. + * + * @ingroup forms + * @see system_settings_form() + */ +function system_cron_settings_submit($form, &$form_state) { + config('system.cron') + ->set('cron_safe_threshold', $form_state['values']['cron_safe_threshold']) + ->save(); + drupal_set_message(t('The configuration options have been saved.')); } /** diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 51603ff..68b3573 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -253,10 +253,11 @@ function system_requirements($phase) { // Report cron status. if ($phase == 'runtime') { + $config = config('system.cron'); // Cron warning threshold defaults to two days. - $threshold_warning = variable_get('cron_threshold_warning', 172800); + $threshold_warning = $config->get('cron_threshold_warning'); // Cron error threshold defaults to two weeks. - $threshold_error = variable_get('cron_threshold_error', 1209600); + $threshold_error = $config->get('cron_threshold_error'); // Cron configuration help text. $help = $t('For more information, see the online handbook entry for configuring cron jobs.', array('@cron-handbook' => 'http://drupal.org/cron')); @@ -283,7 +284,7 @@ function system_requirements($phase) { } $description .= ' ' . $t('You can run cron manually.', array('@cron' => url('admin/reports/status/run-cron'))); - $description .= '