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

#1621 - Cannot login via OpenID

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44617 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andrew O'Neil 2007-11-12 01:47:48 +00:00
parent 7b435cd32f
commit 8f058227b0
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/Session.php
View File

@ -35,7 +35,10 @@ class Session {
return Controller::curr()->getSession()->inst_clear($name); return Controller::curr()->getSession()->inst_clear($name);
} }
public static function getAll() { public static function getAll() {
return Controller::curr()->getSession()->inst_getAll($name); return Controller::curr()->getSession()->inst_getAll();
}
public static function save() {
return Controller::curr()->getSession()->inst_save();
} }
/** /**
@ -115,6 +118,14 @@ class Session {
return $this->data; return $this->data;
} }
public function inst_save() {
// Save the updated session back
foreach($this->data as $k => $v) {
$_SESSION[$k] = $v;
}
}
/** /**
* Sets the appropriate form message in session, with type. This will be shown once, * Sets the appropriate form message in session, with type. This will be shown once,
* for the form specified. * for the form specified.

5
core/control/Director.php
View File

@ -75,11 +75,8 @@ class Director {
} else if($controllerObj) { } else if($controllerObj) {
$response = $controllerObj->run(array_merge((array)$_GET, (array)$_POST, (array)$_FILES)); $response = $controllerObj->run(array_merge((array)$_GET, (array)$_POST, (array)$_FILES));
// Save the updated session back
foreach($controllerObj->getSession()->inst_getAll() as $k => $v) {
$_SESSION[$k] = $v;
}
$controllerObj->getSession()->inst_save();
if(isset($_GET['debug_profile'])) Profiler::mark("Outputting to browser"); if(isset($_GET['debug_profile'])) Profiler::mark("Outputting to browser");
$response->output(); $response->output();