summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/system/system.module5
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/system/system.module b/modules/system/system.module
index d8ad21f16..23d218af2 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -3283,7 +3283,10 @@ function system_page_alter(&$page) {
* Run the automated cron if enabled.
*/
function system_run_automated_cron() {
- if (($threshold = variable_get('cron_safe_threshold', DRUPAL_CRON_DEFAULT_THRESHOLD)) > 0) {
+ // If the site is not fully installed, suppress the automated cron run.
+ // Otherwise it could be triggered prematurely by AJAX requests during
+ // installation.
+ if (($threshold = variable_get('cron_safe_threshold', DRUPAL_CRON_DEFAULT_THRESHOLD)) > 0 && variable_get('install_task') == 'done') {
$cron_last = variable_get('cron_last', NULL);
if (!isset($cron_last) || (REQUEST_TIME - $cron_last > $threshold)) {
drupal_cron_run();