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

FIX Allow the current controller as well as injectable HTTPRequest objects

Browse Source
This commit is contained in:
Robbie Averill 2017-12-12 16:35:53 +13:00
parent 097d0697c5
commit eb6c1fc6de
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Security/SecurityToken.php
View File

@ -178,15 +178,17 @@ class SecurityToken implements TemplateGlobalProvider
* Returns the current session instance from the injector
*
* @return Session
* @throws Exception If the HTTPRequest class hasn't been registered as a service
* @throws Exception If the HTTPRequest class hasn't been registered as a service and no controllers exist
*/
protected function getSession()
{
$injector = Injector::inst();
if (!$injector->has(HTTPRequest::class)) {
throw new Exception('No HTTPRequest object available yet!');
if ($injector->has(HTTPRequest::class)) {
return $injector->get(HTTPRequest::class)->getSession();
} elseif (Controller::has_curr()) {
return Controller::curr()->getRequest()->getSession();
}
return $injector->get(HTTPRequest::class)->getSession();
throw new Exception('No HTTPRequest object or controller available yet!');
}
/**