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

Fix loading providers of 2FA app with more than one provider
nextcloud · Aug 22, 2018 · e27817a · e27817a
2 parents 3dc31e4 + 024a70a
commit e27817a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/lib/private/App/InfoParser.php b/lib/private/App/InfoParser.php
@@ -174,6 +174,9 @@ public function parse($file) {
 		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'];
 		}