[Pkg-owncloud-commits] [owncloud] 16/258: 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 branch master
in repository owncloud.

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

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

diff --git a/lib/private/server.php b/lib/private/server.php
index 20d6078..d1c5768 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -262,14 +262,18 @@ 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() {
-		$user = $this->getUserSession()->getUser();
-		if (!$user) {
-			return null;
+	function getUserFolder($userId = null) {
+		if($userId === null) {
+			$user = $this->getUserSession()->getUser();
+			if (!$user) {
+				return null;
+			}
+			$userId = $user->getUID();
 		}
-		$dir = '/' . $user->getUID();
+		$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