diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-02-16 18:45:25 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2016-02-16 18:45:25 +0100 |
| commit | de58364eb850a918ed84df84983c620b31493606 (patch) | |
| tree | ff2c4e8c79d2be866ff540b27e46ed8b1dfa8cf0 /lib | |
| parent | c6b24573066cfc87b73b1b61b41032b8c5a406cf (diff) | |
| download | nextcloud-server-de58364eb850a918ed84df84983c620b31493606.tar.gz nextcloud-server-de58364eb850a918ed84df84983c620b31493606.zip | |
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) { |