[Pkg-owncloud-commits] [owncloud] 28/69: fix getUserFolder() of server container

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 91a5e728c0bb836d9489dd947a08ee28056e78de
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Mon May 5 18:15:48 2014 +0200

    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 5d90a0b..4c29092 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;
 	}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git