[Pkg-owncloud-commits] [owncloud] 57/95: Always load authentication apps

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v8.0.1
in repository owncloud.

commit 2ed3c7af278ca5be6ada8232d21b6556a44c76ab
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Tue Feb 24 18:00:26 2015 +0100

    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 8a79d46..ae9a7b2 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -739,6 +739,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)
@@ -747,8 +750,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();
 			}
@@ -757,7 +759,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();
 				}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git