[Pkg-owncloud-commits] [owncloud] 56/258: Do not load extra user backends when an upgrade is due

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit dedb47390bd55022210237a9f71174d56a4b1d02
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Mon Sep 8 12:30:04 2014 +0200

    Do not load extra user backends when an upgrade is due
    
    Whenever an upgrade is due, do not load extra user backends
    
    Backport of d6bfd90bf804f6d8bb4c651e6bcf8374dc6b94b4 from master
---
 lib/base.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/base.php b/lib/base.php
index 999e219..b1535ff 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -543,7 +543,9 @@ class OC {
 		OC_Group::useBackend(new OC_Group_Database());
 
 		//setup extra user backends
-		OC_User::setupBackends();
+		if (!self::checkUpgrade(false)) {
+			OC_User::setupBackends();
+		}
 
 		self::registerCacheHooks();
 		self::registerFilesystemHooks();

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