From 91a5e728c0bb836d9489dd947a08ee28056e78de Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 5 May 2014 18:15:48 +0200
Subject: [PATCH] fix getUserFolder() of server container
---
lib/private/server.php | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/lib/private/server.php b/lib/private/server.php
index 5d90a0b19f..4c29092cf4 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -240,15 +240,23 @@ class Server extends SimpleContainer implements IServerContainer {
* @return \OCP\Files\Folder
*/
function getUserFolder() {
-
- $dir = '/files';
+ $dir = '/' . \OCP\User::getUser();
$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);
+ } else {
+ $folder = $folder->get($dir);
+ }
+
return $folder;
}
--
GitLab