diff options
| author | blizzz <blizzz@owncloud.com> | 2014-08-13 16:08:48 +0200 |
|---|---|---|
| committer | blizzz <blizzz@owncloud.com> | 2014-08-13 16:08:48 +0200 |
| commit | 54491e8c68a1973bf6ea3622310fba68bf9d4f43 (patch) | |
| tree | 04dedde1d698b05745b10e26bd365e9b4659e26b | |
| parent | 9ab0ebbedc2660b1ed4fd5b84927295a6a2cc2fd (diff) | |
| parent | 578a57f0fbfef9c76aa0fe9107318e7faed7c90b (diff) | |
| download | nextcloud-server-54491e8c68a1973bf6ea3622310fba68bf9d4f43.tar.gz nextcloud-server-54491e8c68a1973bf6ea3622310fba68bf9d4f43.zip | |
Merge pull request #10323 from gekmihesg/master
Load authentication backends before tryBasicAuth
| -rw-r--r-- | lib/base.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php index cba5d4a4276..99c2764d22c 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(); } |