mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9644 from owncloud/fix_user_api 

Fix user api
This commit is contained in:
Thomas Müller 2014-07-15 23:57:02 +02:00
parent 10b59f101f 818929274d
commit 0f9b22107b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/server.php
View File

@ -255,7 +255,7 @@ class Server extends SimpleContainer implements IServerContainer {
* @return \OCP\Files\Folder * @return \OCP\Files\Folder
*/ */
function getUserFolder() { function getUserFolder() {
$dir = '/' . \OCP\User::getUser(); $dir = '/' . $this->getUserSession()->getUser()->getUID();
$root = $this->getRootFolder(); $root = $this->getRootFolder();
$folder = null; $folder = null;

4
lib/public/iusersession.php
View File

@ -52,14 +52,14 @@ interface IUserSession {
/** /**
* set the currently active user * set the currently active user
* *
* @param \OCP\User|null $user * @param \OCP\IUser|null $user
*/ */
public function setUser($user); public function setUser($user);
/** /**
* get the current active user * get the current active user
* *
* @return \OCP\User * @return \OCP\IUser
*/ */
public function getUser(); public function getUser();
} }