From de58364eb850a918ed84df84983c620b31493606 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 16 Feb 2016 18:45:25 +0100
Subject: Handles null as return code and uses proper UserFolder in trashbin

---
 lib/private/server.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

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) {
-- 
cgit v1.2.3