summaryrefslogtreecommitdiffstats
path: root/lib/private/user.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-08-28 16:59:56 +0200
committerRobin Appelman <icewind@owncloud.com>2014-09-02 16:15:42 +0200
commita9a37b5363e5f08013ab8b4b7bff02652c3a4d12 (patch)
treede2504c060b895d20b733e3a86e007205ec3103d /lib/private/user.php
parent90f66e0f8dd3be1133c89a61ba09a8c3e0de7d07 (diff)
downloadnextcloud-server-a9a37b5363e5f08013ab8b4b7bff02652c3a4d12.tar.gz
nextcloud-server-a9a37b5363e5f08013ab8b4b7bff02652c3a4d12.zip
Don't automatically setup the filesystem the moment we load OC\Files\FileSystem
Diffstat (limited to 'lib/private/user.php')
-rw-r--r--lib/private/user.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/private/user.php b/lib/private/user.php
index c9b1522f85a..509a7c71209 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;
}
/**