diff options
| author | Christoph Wurst <christoph@owncloud.com> | 2016-05-11 11:23:25 +0200 |
|---|---|---|
| committer | Christoph Wurst <christoph@owncloud.com> | 2016-05-23 11:21:10 +0200 |
| commit | dfb4d426c24c8cbb7e207a3dd92b5fcd894a1977 (patch) | |
| tree | dc640b6bb84d032a6a45ca03ffe91e37d9c99ea9 /lib/private/App | |
| parent | dec3f9ebcbdeacf5bc483df93900b157a1a5e546 (diff) | |
| download | nextcloud-server-dfb4d426c24c8cbb7e207a3dd92b5fcd894a1977.tar.gz nextcloud-server-dfb4d426c24c8cbb7e207a3dd92b5fcd894a1977.zip | |
Add two factor auth to core
Diffstat (limited to 'lib/private/App')
| -rw-r--r-- | lib/private/App/AppManager.php | 2 | ||||
| -rw-r--r-- | lib/private/App/InfoParser.php | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php index 69e5334774e..37cfb83012c 100644 --- a/lib/private/App/AppManager.php +++ b/lib/private/App/AppManager.php @@ -301,7 +301,7 @@ class AppManager implements IAppManager { * * @param string $appId app id * - * @return array app iinfo + * @return array app info * * @internal */ diff --git a/lib/private/App/InfoParser.php b/lib/private/App/InfoParser.php index e9456550206..7e6e5df5411 100644 --- a/lib/private/App/InfoParser.php +++ b/lib/private/App/InfoParser.php @@ -92,6 +92,9 @@ class InfoParser { if (!array_key_exists('background-jobs', $array)) { $array['background-jobs'] = []; } + if (!array_key_exists('two-factor-providers', $array)) { + $array['two-factor-providers'] = []; + } if (array_key_exists('documentation', $array) && is_array($array['documentation'])) { foreach ($array['documentation'] as $key => $url) { |