diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2013-11-13 19:43:18 +0100 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2013-11-13 19:43:18 +0100 |
| commit | 8d0d0836bae968d3abff5f5ff9db230d449397a6 (patch) | |
| tree | 1e860674e40972644148ebd9614981d2ff1f34de /lib/private/files/filesystem.php | |
| parent | cd4a816c1187639ce6e3982b308c637bdd3f20e9 (diff) | |
| parent | 58ff8a86733973980370b4e639203d32b2663d9a (diff) | |
| download | nextcloud-server-8d0d0836bae968d3abff5f5ff9db230d449397a6.tar.gz nextcloud-server-8d0d0836bae968d3abff5f5ff9db230d449397a6.zip | |
Merge branch 'master' of https://github.com/owncloud/corev6.0.0beta4
Diffstat (limited to 'lib/private/files/filesystem.php')
| -rw-r--r-- | lib/private/files/filesystem.php | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php index e40502bbe64..899666f3e1a 100644 --- a/lib/private/files/filesystem.php +++ b/lib/private/files/filesystem.php @@ -307,10 +307,18 @@ class Filesystem { $root = \OC_User::getHome($user); $userObject = \OC_User::getManager()->get($user); - if (\OC\Files\Cache\Storage::exists('local::' . $root . '/') or is_null($userObject)) { + + if (!is_null($userObject)) { + // check for legacy home id (<= 5.0.12) + if (\OC\Files\Cache\Storage::exists('local::' . $root . '/')) { + self::mount('\OC\Files\Storage\Home', array('user' => $userObject, 'legacy' => true), $user); + } + else { + self::mount('\OC\Files\Storage\Home', array('user' => $userObject), $user); + } + } + else { self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user); - } else { - self::mount('\OC\Files\Storage\Home', array('user' => $userObject), $user); } $datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data"); |