summaryrefslogtreecommitdiff
path: root/system/libraries/drivers/Session/Cache.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-07-02 18:00:22 -0700
committerBharat Mediratta <bharat@menalto.com>2009-07-02 18:00:22 -0700
commiteb5538d1357dade9e6e08d1b603033928944011c (patch)
treeee04f9be38a40f4125eafab5367bba6cf1b61164 /system/libraries/drivers/Session/Cache.php
parent1a5fe42b555d51d22bde1521100a31d2b434486b (diff)
parenta633c134b754305eaa611c5d67af4ca7c79beafe (diff)
Merge branch 'master' of git@github.com:/gallery/gallery3
Conflicts: modules/server_add/controllers/admin_server_add.php
Diffstat (limited to 'system/libraries/drivers/Session/Cache.php')
-rw-r--r--system/libraries/drivers/Session/Cache.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/system/libraries/drivers/Session/Cache.php b/system/libraries/drivers/Session/Cache.php
index 7221c9f2..45e49495 100644
--- a/system/libraries/drivers/Session/Cache.php
+++ b/system/libraries/drivers/Session/Cache.php
@@ -10,7 +10,7 @@
* Lifetime does not need to be set as it is
* overridden by the session expiration setting.
*
- * $Id: Cache.php 3769 2008-12-15 00:48:56Z zombor $
+ * $Id: Cache.php 4431 2009-07-01 03:41:41Z kiall $
*
* @package Core
* @author Kohana Team
@@ -76,6 +76,9 @@ class Session_Cache_Driver implements Session_Driver {
public function write($id, $data)
{
+ if ( ! Session::$should_save)
+ return TRUE;
+
$id = 'session_'.$id;
$data = Kohana::config('session.encryption') ? $this->encrypt->encode($data) : $data;