summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorwebchick <webchick@24967.no-reply.drupal.org>2012-08-18 14:12:09 +0200
committerwebchick <webchick@24967.no-reply.drupal.org>2012-08-18 14:12:09 +0200
commite5795890a0dc273405c40549f05c247159c195c0 (patch)
tree05a332a4e78106f347e26d9ee9750699bcaf63cb /includes
parent18300548118660251a07de4afbe440b92d696599 (diff)
downloadbrdo-e5795890a0dc273405c40549f05c247159c195c0.tar.gz
brdo-e5795890a0dc273405c40549f05c247159c195c0.tar.bz2
Issue #1688016 by sun, lucascaro: Fixed drupal_cron_run() unconditionally re-enables writing of the user session.
Diffstat (limited to 'includes')
-rw-r--r--includes/common.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/common.inc b/includes/common.inc
index 401c053f3..efb7926a3 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -5114,6 +5114,7 @@ function drupal_cron_run() {
@ignore_user_abort(TRUE);
// Prevent session information from being saved while cron is running.
+ $original_session_saving = drupal_save_session();
drupal_save_session(FALSE);
// Force the current user to anonymous to ensure consistent permissions on
@@ -5176,7 +5177,7 @@ function drupal_cron_run() {
}
// Restore the user.
$GLOBALS['user'] = $original_user;
- drupal_save_session(TRUE);
+ drupal_save_session($original_session_saving);
return $return;
}