From f8aeebced72658a3a586b60ed8c535c563c5e996 Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Wed, 16 Mar 2011 18:53:49 +0000
Subject: [PATCH] [gh-108] Merging from testing into staging
git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@567 20a16fea-79d4-4915-8869-1ea9d5ebf173
---
includes/session.inc | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/includes/session.inc b/includes/session.inc
index d86d72e00..0ff7c2105 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -100,6 +100,10 @@ function _drupal_session_read($sid) {
else {
$user = db_query("SELECT u.*, s.* FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.sid = :sid", array(':sid' => $sid))->fetchObject();
}
+ $session_data = @gzinflate($user->session);
+ if ($session_data !== FALSE) {
+ $user->session = $session_data;
+ }
// We found the client's session record and they are an authenticated,
// active user.
@@ -176,7 +180,7 @@ function _drupal_session_write($sid, $value) {
'uid' => $user->uid,
'cache' => isset($user->cache) ? $user->cache : 0,
'hostname' => ip_address(),
- 'session' => $value,
+ 'session' => gzdeflate($value, 9),
'timestamp' => REQUEST_TIME,
);
--
GitLab