aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgekmihesg <markus@gekmihesg.de>2014-08-10 13:29:32 +0200
committergekmihesg <markus@gekmihesg.de>2014-08-10 13:29:32 +0200
commit578a57f0fbfef9c76aa0fe9107318e7faed7c90b (patch)
tree85dd2e77805b300e96dac24c88ed3b6e1d45337c
parentc920ca32e8798d609adb4251374844e59d1cb3d8 (diff)
downloadnextcloud-server-578a57f0fbfef9c76aa0fe9107318e7faed7c90b.tar.gz
nextcloud-server-578a57f0fbfef9c76aa0fe9107318e7faed7c90b.zip
Load authentication backends before tryBasicAuth
-rw-r--r--lib/base.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php
index a6f6f6f71d7..b79998b352f 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -699,6 +699,9 @@ class OC {
if (!OC_User::isLoggedIn()) {
// Test it the user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
+ if (!OC_Config::getValue('maintenance', false) && !self::checkUpgrade(false)) {
+ OC_App::loadApps(array('authentication'));
+ }
OC::tryBasicAuthLogin();
}