summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgekmihesg <markus@gekmihesg.de>2014-08-10 13:29:32 +0200
committerArthur Schiwon <blizzz@owncloud.com>2014-08-13 16:09:59 +0200
commiteb68b0d5c64fa4e818951e39db30fe29ab3f0baf (patch)
tree2a669005c93356fe326bff17025faf63d39f44d5
parentca3d09c940fcca92a4f52295e4e0d0a4dc44e20f (diff)
downloadnextcloud-server-eb68b0d5c64fa4e818951e39db30fe29ab3f0baf.tar.gz
nextcloud-server-eb68b0d5c64fa4e818951e39db30fe29ab3f0baf.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 1e6d5cf808b..d08778ef848 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -692,6 +692,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();
}