diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-06-16 16:02:30 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-07-03 11:11:58 +0200 |
| commit | 3e97ca3b9637a44ffd366838164461bda65e889f (patch) | |
| tree | 08a3dc169eea3e0eb516051c77d6aa31bd66748c /lib/private/server.php | |
| parent | f70791653cefc40f640e48dcad489237b750d85c (diff) | |
| download | nextcloud-server-3e97ca3b9637a44ffd366838164461bda65e889f.tar.gz nextcloud-server-3e97ca3b9637a44ffd366838164461bda65e889f.zip | |
Add getUserFolder to IRootFolder
* untangle DI of user specific folders
* allows to autodetect the dependency
Diffstat (limited to 'lib/private/server.php')
| -rw-r--r-- | lib/private/server.php | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/lib/private/server.php b/lib/private/server.php index af137ce36aa..84141fe28c1 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -535,29 +535,9 @@ class Server extends SimpleContainer implements IServerContainer { return null; } $userId = $user->getUID(); - } else { - $user = $this->getUserManager()->get($userId); } - \OC\Files\Filesystem::initMountPoints($userId); - $dir = '/' . $userId; $root = $this->getRootFolder(); - $folder = null; - - if (!$root->nodeExists($dir)) { - $folder = $root->newFolder($dir); - } else { - $folder = $root->get($dir); - } - - $dir = '/files'; - if (!$folder->nodeExists($dir)) { - $folder = $folder->newFolder($dir); - \OC_Util::copySkeleton($user, $folder); - } else { - $folder = $folder->get($dir); - } - - return $folder; + return $root->getUserFolder($userId); } /** |