summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2017-09-18 13:19:47 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2017-09-27 17:51:22 +0200
commit499da044b65635ee3f770d6df7ad34590a03c3fd (patch)
tree8f9e64df796794d9f3855a1a2fea60036c128c48 /lib
parentf6ccc1e0a197db0664e082f3f6161cf5a4ca20c2 (diff)
downloadnextcloud-server-499da044b65635ee3f770d6df7ad34590a03c3fd.tar.gz
nextcloud-server-499da044b65635ee3f770d6df7ad34590a03c3fd.zip
don't pass User object when uid string is expected
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/legacy/helper.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php
index 6775fe99dcd..b1aec08890e 100644
--- a/lib/private/legacy/helper.php
+++ b/lib/private/legacy/helper.php
@@ -558,7 +558,8 @@ class OC_Helper {
|| $storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')
) {
/** @var \OC\Files\Storage\Home $storage */
- $user = $storage->getUser();
+ $userInstance = $storage->getUser();
+ $user = ($userInstance === null) ? null : $userInstance->getUID();
} else {
$user = \OC::$server->getUserSession()->getUser()->getUID();
}