mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10789 from nextcloud/fix/2fa-app-multiple-providers 

Fix loading providers of 2FA app with more than one provider
This commit is contained in:
Morris Jobke 2018-08-22 10:50:22 +02:00 committed by GitHub
parent 3dc31e4231 024a70a188
commit e27817aeda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/private/App/InfoParser.php
View File

@ -174,6 +174,9 @@ class InfoParser {
if (isset($array['commands']['command']) && is_array($array['commands']['command'])) {
$array['commands'] = $array['commands']['command'];
}
if (isset($array['two-factor-providers']['provider']) && is_array($array['two-factor-providers']['provider'])) {
$array['two-factor-providers'] = $array['two-factor-providers']['provider'];
}
if (isset($array['activity']['filters']['filter']) && is_array($array['activity']['filters']['filter'])) {
$array['activity']['filters'] = $array['activity']['filters']['filter'];
}