diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-08-28 16:59:56 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-09-02 16:15:42 +0200 |
| commit | a9a37b5363e5f08013ab8b4b7bff02652c3a4d12 (patch) | |
| tree | de2504c060b895d20b733e3a86e007205ec3103d /lib | |
| parent | 90f66e0f8dd3be1133c89a61ba09a8c3e0de7d07 (diff) | |
| download | nextcloud-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')
| -rw-r--r-- | lib/base.php | 1 | ||||
| -rw-r--r-- | lib/private/files/filesystem.php | 2 | ||||
| -rw-r--r-- | lib/private/user.php | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/lib/base.php b/lib/base.php index 176f799f94d..6ec5f69e45d 100644 --- a/lib/base.php +++ b/lib/base.php @@ -776,6 +776,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 1dbe66143ac..db46bcfd1ea 100644 --- a/lib/private/files/filesystem.php +++ b/lib/private/files/filesystem.php @@ -794,5 +794,3 @@ class Filesystem { return self::$defaultInstance->getETag($path); } } - -\OC_Util::setupFS(); 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; } /** |