diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-24 23:31:40 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-24 23:31:40 -0800 |
| commit | 7e7e0c51fb97312c69ee0cf03e9241f1bf08294e (patch) | |
| tree | e8fa4a7b3440873424d5ce2876ba7fc64ebd662e | |
| parent | 31f881415b66c057d2ec041e6237c5e55dd44280 (diff) | |
| parent | c1d7b22d0811db915d1432e8c30f2d6337b6dd96 (diff) | |
| download | nextcloud-server-7e7e0c51fb97312c69ee0cf03e9241f1bf08294e.tar.gz nextcloud-server-7e7e0c51fb97312c69ee0cf03e9241f1bf08294e.zip | |
Merge pull request #14471 from owncloud/always-load-authentication-apps
Always load authentication apps
| -rw-r--r-- | lib/base.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/base.php b/lib/base.php index 1ffeb7bdec4..0ac39dec831 100644 --- a/lib/base.php +++ b/lib/base.php @@ -797,6 +797,9 @@ class OC { self::checkUpgrade(); } + // Always load authentication apps + OC_App::loadApps(['authentication']); + // Load minimum set of apps if (!self::checkUpgrade(false) && !$systemConfig->getValue('maintenance', false) @@ -805,8 +808,7 @@ class OC { if(OC_User::isLoggedIn()) { OC_App::loadApps(); } else { - // For guests: Load only authentication, filesystem and logging - OC_App::loadApps(array('authentication')); + // For guests: Load only filesystem and logging OC_App::loadApps(array('filesystem', 'logging')); \OC_User::tryBasicAuthLogin(); } @@ -815,7 +817,6 @@ class OC { if (!self::$CLI and (!isset($_GET["logout"]) or ($_GET["logout"] !== 'true'))) { try { if (!$systemConfig->getValue('maintenance', false) && !\OCP\Util::needUpgrade()) { - OC_App::loadApps(array('authentication')); OC_App::loadApps(array('filesystem', 'logging')); OC_App::loadApps(); } |