[Pkg-owncloud-commits] [owncloud] 63/121: Load authentication backends before tryBasicAuth
David Prévot
taffit at moszumanska.debian.org
Thu Aug 21 16:44:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit eb68b0d5c64fa4e818951e39db30fe29ab3f0baf
Author: gekmihesg <markus at gekmihesg.de>
Date: Sun Aug 10 13:29:32 2014 +0200
Load authentication backends before tryBasicAuth
---
lib/base.php | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/base.php b/lib/base.php
index 1e6d5cf..d08778e 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();
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list