fix getUserFolder() of server container

1 files changed, 10 insertions, 2 deletions

diff --git a/lib/private/server.php b/lib/private/server.php
index 5d90a0b19fc..4c29092cf44 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;
 	}