diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-02-26 12:40:10 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-02-26 12:40:10 +0100 |
| commit | c0550ed95333e4fc5eae689b99f638318b738609 (patch) | |
| tree | b96df2d638178d688ec50aa098b61c9d8ae1e880 /lib | |
| parent | b057ae2da13964bb79e51286f8a34ae595ee4a2f (diff) | |
| parent | 2ed3c7af278ca5be6ada8232d21b6556a44c76ab (diff) | |
| download | nextcloud-server-c0550ed95333e4fc5eae689b99f638318b738609.tar.gz nextcloud-server-c0550ed95333e4fc5eae689b99f638318b738609.zip | |
Merge pull request #14484 from owncloud/backport/auth/14471
[Backport] Always load authentication apps
Diffstat (limited to 'lib')
| -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 8a79d4624d8..ae9a7b2bd25 100644 --- a/lib/base.php +++ b/lib/base.php @@ -739,6 +739,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) @@ -747,8 +750,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(); } @@ -757,7 +759,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(); } |