Merge pull request #7829 from Firesphere/patch-3

[bugfix] $request == null breaks
This commit is contained in:
Damian Mooyman 2018-02-05 16:43:40 +13:00 committed by GitHub
commit 02ec0b8375
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -651,7 +651,7 @@ class Security extends Controller implements TemplateGlobalProvider
{
if ($request) {
$this->setRequest($request);
} elseif ($request) {
} elseif ($this->getRequest()) {
$request = $this->getRequest();
} else {
throw new HTTPResponse_Exception("No request available", 500);