diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-17 10:58:31 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-17 10:58:31 +0100 |
| commit | 9e415a956af39692e470fab5b48ffaa787ffe3f5 (patch) | |
| tree | f3da24bd52b5d439dff494b33916e68b09bcf0af /lib | |
| parent | 774109b7628aa62a1975f7c2dea4f8280f563b28 (diff) | |
| parent | de58364eb850a918ed84df84983c620b31493606 (diff) | |
| download | nextcloud-server-9e415a956af39692e470fab5b48ffaa787ffe3f5.tar.gz nextcloud-server-9e415a956af39692e470fab5b48ffaa787ffe3f5.zip | |
Merge pull request #22451 from owncloud/use-proper-user-folder
Handles null as return code and uses proper UserFolder in trashbin
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/server.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/server.php b/lib/private/server.php index b52c5188a7b..ef4764d07cf 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -730,7 +730,7 @@ class Server extends ServerContainer implements IServerContainer { * Returns a view to ownCloud's files folder * * @param string $userId user ID - * @return \OCP\Files\Folder + * @return \OCP\Files\Folder|null */ public function getUserFolder($userId = null) { if ($userId === null) { |