[Pkg-owncloud-commits] [owncloud] 111/258: Don't automatically setup the filesystem the moment we load OC\Files\FileSystem

[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 8905e77d60290167524307dbe7b2f80ea7a2aaa8
Author: Robin Appelman <icewind at owncloud.com>
Date:   Thu Aug 28 16:59:56 2014 +0200

    Don't automatically setup the filesystem the moment we load OC\Files\FileSystem
---
 lib/base.php                     | 1 +
 lib/private/files/filesystem.php | 2 --
 lib/private/user.php             | 6 +++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 8239539..6fd27fa 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -747,6 +747,7 @@ class OC {
 		if (OC_User::isLoggedIn()) {
 			OC_App::loadApps();
 			OC_User::setupBackends();
+			OC_Util::setupFS();
 			if (isset($_GET["logout"]) and ($_GET["logout"])) {
 				OC_JSON::callCheck();
 				if (isset($_COOKIE['oc_token'])) {
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index 4774d25..02bfa00 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -796,5 +796,3 @@ class Filesystem {
 		return self::$defaultInstance->getETag($path);
 	}
 }
-
-\OC_Util::setupFS();
diff --git a/lib/private/user.php b/lib/private/user.php
index ce7b457..fe65605 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -232,7 +232,11 @@ class OC_User {
 	 */
 	public static function login($uid, $password) {
 		session_regenerate_id(true);
-		return self::getUserSession()->login($uid, $password);
+		$result = self::getUserSession()->login($uid, $password);
+		if ($result) {
+			OC_Util::setupFS($uid);
+		}
+		return $result;
 	}
 
 	/**

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