diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-08-22 10:50:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-22 10:50:22 +0200 |
| commit | e27817aedaafb3ad387520c5dc9298c7ffcea6ad (patch) | |
| tree | cb68d9ed94bb6f4d6a76daa611ecdd17033fb9a7 /lib | |
| parent | 3dc31e42318a3dce226021501610f6142d91d121 (diff) | |
| parent | 024a70a1885fe83cdb0bb64bc8755fcd04289116 (diff) | |
| download | nextcloud-server-e27817aedaafb3ad387520c5dc9298c7ffcea6ad.tar.gz nextcloud-server-e27817aedaafb3ad387520c5dc9298c7ffcea6ad.zip | |
Merge pull request #10789 from nextcloud/fix/2fa-app-multiple-providers
Fix loading providers of 2FA app with more than one provider
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/App/InfoParser.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/App/InfoParser.php b/lib/private/App/InfoParser.php index b811cfca31d..e0ed63fc784 100644 --- a/lib/private/App/InfoParser.php +++ b/lib/private/App/InfoParser.php @@ -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']; } |