[Pkg-owncloud-commits] [owncloud] 17/50: Add optional user ID parameter for getUseFolder

[David Prévot]

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

taffit pushed a commit to annotated tag v6.0.6RC1
in repository owncloud.

commit 4a4f52e7a4a720f24d6d9b5bab7fa7c49e71dce0
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Sun Aug 31 09:49:19 2014 +0200

    Add optional user ID parameter for getUseFolder
    
    Conflicts:
    	lib/private/server.php
---
 lib/private/server.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/private/server.php b/lib/private/server.php
index 5847be9..4603637 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -209,10 +209,17 @@ class Server extends SimpleContainer implements IServerContainer {
 	/**
 	 * Returns a view to ownCloud's files folder
 	 *
+	 * @param string $userId user ID
 	 * @return \OCP\Files\Folder
 	 */
-	function getUserFolder() {
-		$dir = '/' . \OCP\User::getUser();
+	function getUserFolder($userId = null) {
+		if($userId === null) {
+			$userId = \OCP\User::getUser();
+			if (!$userId) {
+				return null;
+			}
+		}
+		$dir = '/' . $userId;
 		$root = $this->getRootFolder();
 		$folder = null;
 

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