tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-28 20:29:15 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8961 from indygriffiths/patch-1

Browse Source 
NEW Only get an authenticator if it's an object
This commit is contained in:
Guy Marriott 2019-05-06 14:27:18 +12:00 committed by GitHub
commit 371588e8b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Security/Security.php
View File

@ -202,7 +202,7 @@ class Security extends Controller implements TemplateGlobalProvider
*/ */
public function getAuthenticators() public function getAuthenticators()
{ {
return $this->authenticators; return array_filter($this->authenticators);
} }
/** /**
@ -244,7 +244,7 @@ class Security extends Controller implements TemplateGlobalProvider
*/ */
protected function getAuthenticator($name = 'default') protected function getAuthenticator($name = 'default')
{ {
$authenticators = $this->authenticators; $authenticators = $this->getAuthenticators();
if (isset($authenticators[$name])) { if (isset($authenticators[$name])) {
return $authenticators[$name]; return $authenticators[$name];
@ -286,7 +286,7 @@ class Security extends Controller implements TemplateGlobalProvider
*/ */
public function hasAuthenticator($authenticator) public function hasAuthenticator($authenticator)
{ {
$authenticators = $this->authenticators; $authenticators = $this->getAuthenticators();
return !empty($authenticators[$authenticator]); return !empty($authenticators[$authenticator]);
} }