Commit fcd77476 authored by catch's avatar catch

Issue #1688016 by sun: Fixed drupal_cron_run() unconditionally re-enables...

Issue #1688016 by sun: Fixed drupal_cron_run() unconditionally re-enables writing of the user session.
parent 557c5e69
...@@ -5015,6 +5015,7 @@ function drupal_cron_run() { ...@@ -5015,6 +5015,7 @@ function drupal_cron_run() {
@ignore_user_abort(TRUE); @ignore_user_abort(TRUE);
// Prevent session information from being saved while cron is running. // Prevent session information from being saved while cron is running.
$original_session_saving = drupal_save_session();
drupal_save_session(FALSE); drupal_save_session(FALSE);
// Force the current user to anonymous to ensure consistent permissions on // Force the current user to anonymous to ensure consistent permissions on
...@@ -5081,7 +5082,7 @@ function drupal_cron_run() { ...@@ -5081,7 +5082,7 @@ function drupal_cron_run() {
} }
// Restore the user. // Restore the user.
$GLOBALS['user'] = $original_user; $GLOBALS['user'] = $original_user;
drupal_save_session(TRUE); drupal_save_session($original_session_saving);
return $return; return $return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment