From c1d7b22d0811db915d1432e8c30f2d6337b6dd96 Mon Sep 17 00:00:00 2001 From: Lukas Reschke <lukas@owncloud.com> Date: Tue, 24 Feb 2015 18:00:26 +0100 Subject: [PATCH] Always load authentication apps The current code path may trigger situations where the LDAP application is not yet loaded and thus problems with the authentication appeared. In previous versions of ownCloud the authentication mechanism manually loaded these apps which is why this affects ownCloud 8 and master only for my knowledge. (certainly not 6, maybe 7) Backport to 8 might be something to consider. Fixes https://github.com/owncloud/core/issues/14469 --- lib/base.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/base.php b/lib/base.php index 1ffeb7bdec..0ac39dec83 100644 --- a/lib/base.php +++ b/lib/base.php @@ -797,6 +797,9 @@ class OC { self::checkUpgrade(); } + // Always load authentication apps + OC_App::loadApps(['authentication']); + // Load minimum set of apps if (!self::checkUpgrade(false) && !$systemConfig->getValue('maintenance', false) @@ -805,8 +808,7 @@ class OC { if(OC_User::isLoggedIn()) { OC_App::loadApps(); } else { - // For guests: Load only authentication, filesystem and logging - OC_App::loadApps(array('authentication')); + // For guests: Load only filesystem and logging OC_App::loadApps(array('filesystem', 'logging')); \OC_User::tryBasicAuthLogin(); } @@ -815,7 +817,6 @@ class OC { if (!self::$CLI and (!isset($_GET["logout"]) or ($_GET["logout"] !== 'true'))) { try { if (!$systemConfig->getValue('maintenance', false) && !\OCP\Util::needUpgrade()) { - OC_App::loadApps(array('authentication')); OC_App::loadApps(array('filesystem', 'logging')); OC_App::loadApps(); } -- GitLab