Merge pull request #9644 from owncloud/fix_user_api

Fix user api

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/private/server.php b/lib/private/server.php
index da705863078..3237ce30ccf 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -255,7 +255,7 @@ class Server extends SimpleContainer implements IServerContainer {
 	 * @return \OCP\Files\Folder
 	 */
 	function getUserFolder() {
-		$dir = '/' . \OCP\User::getUser();
+		$dir = '/' . $this->getUserSession()->getUser()->getUID();
 		$root = $this->getRootFolder();
 		$folder = null;
 
diff --git a/lib/public/iusersession.php b/lib/public/iusersession.php
index e9d417c1ace..db4abe150d2 100644
--- a/lib/public/iusersession.php
+++ b/lib/public/iusersession.php
@@ -52,14 +52,14 @@ interface IUserSession {
 	/**
 	 * set the currently active user
 	 *
-	 * @param \OCP\User|null $user
+	 * @param \OCP\IUser|null $user
 	 */
 	public function setUser($user);
 
 	/**
 	 * get the current active user
 	 *
-	 * @return \OCP\User
+	 * @return \OCP\IUser
 	 */
 	public function getUser();
 }