Add optional user ID parameter for getUseFolder

Conflicts:
	lib/private/server.php

diff --git a/lib/private/server.php b/lib/private/server.php
index 5847be9eed8bd1c66497f7d2d1f27a7d8bc3faac..4603637011664d70cdd258fde478880258c30232 100644 (file)
--- 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;