summaryrefslogtreecommitdiffstats
path: root/lib/private/App/InfoParser.php
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@winzerhof-wurst.at>2018-08-21 22:53:38 +0200
committerChristoph Wurst <christoph@winzerhof-wurst.at>2018-08-21 22:53:38 +0200
commit024a70a1885fe83cdb0bb64bc8755fcd04289116 (patch)
tree092905ed992a8a8a21fcf0d22403536f4b07b774 /lib/private/App/InfoParser.php
parent1a7516dd9346321668bd4a93f8f878ebf2d45ef3 (diff)
downloadnextcloud-server-024a70a1885fe83cdb0bb64bc8755fcd04289116.tar.gz
nextcloud-server-024a70a1885fe83cdb0bb64bc8755fcd04289116.zip
Fix loading providers of 2FA app with more than one provider
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'lib/private/App/InfoParser.php')
-rw-r--r--lib/private/App/InfoParser.php3
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'];
}