tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Don't require a current controller for Session::get/set/etc to work.

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@111043 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-09-21 20:29:08 +00:00 committed by Sam Minnee
parent 73784b416a
commit 1b5ec9bd50
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/Session.php
View File

@ -188,7 +188,7 @@ class Session {
* Add a value to a specific key in the session array
*/
public static function add_to_array($name, $val) {
return Controller::curr()->getSession()->inst_addToArray($name, $val);
return self::current_session()->inst_addToArray($name, $val);
}
/**
@ -198,7 +198,7 @@ class Session {
* @param string $val Value
*/
public static function set($name, $val) {
return Controller::curr()->getSession()->inst_set($name, $val);
return self::current_session()->inst_set($name, $val);
}
/**
@ -207,7 +207,7 @@ class Session {
* @param string $name Key to lookup
*/
public static function get($name) {
return Controller::curr()->getSession()->inst_get($name);
return self::current_session()->inst_get($name);
}
/**
@ -216,7 +216,7 @@ class Session {
* @return Array
*/
public static function get_all() {
return Controller::curr()->getSession()->inst_getAll();
return self::current_session()->inst_getAll();
}
/**
@ -234,14 +234,14 @@ class Session {
* @param string $name Key to lookup
*/
public static function clear($name) {
return Controller::curr()->getSession()->inst_clear($name);
return self::current_session()->inst_clear($name);
}
/**
* Clear all the values
*/
public static function clear_all() {
return Controller::curr()->getSession()->inst_clearAll();
return self::current_session()->inst_clearAll();
}
/**
@ -257,7 +257,18 @@ class Session {
* Save all the values in our session to $_SESSION
*/
public static function save() {
return Controller::curr()->getSession()->inst_save();
return self::current_session()->inst_save();
}
protected static $default_session = null;
protected static function current_session() {
if(Controller::has_curr()) {
return Controller::curr()->getSession();
} else {
if(!self::$default_session) self::$default_session = new Session(isset($_SESSION) ? $_SESSION : array());
return self::$default_session;
}
}
public function inst_set($name, $val) {