diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-07-02 18:00:22 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-07-02 18:00:22 -0700 |
| commit | eb5538d1357dade9e6e08d1b603033928944011c (patch) | |
| tree | ee04f9be38a40f4125eafab5367bba6cf1b61164 /system/libraries/drivers/Session/Cookie.php | |
| parent | 1a5fe42b555d51d22bde1521100a31d2b434486b (diff) | |
| parent | a633c134b754305eaa611c5d67af4ca7c79beafe (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/Cookie.php')
| -rw-r--r-- | system/libraries/drivers/Session/Cookie.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/system/libraries/drivers/Session/Cookie.php b/system/libraries/drivers/Session/Cookie.php index 7b791064..4cf18fc2 100644 --- a/system/libraries/drivers/Session/Cookie.php +++ b/system/libraries/drivers/Session/Cookie.php @@ -2,7 +2,7 @@ /** * Session cookie driver. * - * $Id: Cookie.php 3769 2008-12-15 00:48:56Z zombor $ + * $Id: Cookie.php 4431 2009-07-01 03:41:41Z kiall $ * * @package Core * @author Kohana Team @@ -48,6 +48,9 @@ class Session_Cookie_Driver implements Session_Driver { public function write($id, $data) { + if ( ! Session::$should_save) + return TRUE; + $data = empty($this->encrypt) ? base64_encode($data) : $this->encrypt->encode($data); if (strlen($data) > 4048) |