mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't automatically setup the filesystem the moment we load OC\Files\FileSystem

This commit is contained in:
Robin Appelman 2014-08-28 16:59:56 +02:00
parent 90f66e0f8d
commit a9a37b5363
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/base.php
View File

@ -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'])) {

2
lib/private/files/filesystem.php
View File

@ -794,5 +794,3 @@ class Filesystem {
return self::$defaultInstance->getETag($path);
}
}
\OC_Util::setupFS();

6
lib/private/user.php
View File

@ -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;
}
/**