Merge pull request #10323 from gekmihesg/master

Load authentication backends before tryBasicAuth
remotes/origin/fix-10825
blizzz 11 years ago
commit 54491e8c68
  1. 3
      lib/base.php

@ -699,6 +699,9 @@ class OC {
if (!OC_User::isLoggedIn()) { if (!OC_User::isLoggedIn()) {
// Test it the user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP // 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(); OC::tryBasicAuthLogin();
} }

Loading…
Cancel
Save