diff options
| -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 8239539fa85..6fd27fa0513 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 4774d25ad9e..02bfa00fd03 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 ce7b457798f..fe65605bf78 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; } /** |