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

don't pass User object when uid string is expected 

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2017-09-18 13:19:47 +02:00
parent f6ccc1e0a1
commit 499da044b6
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/private/legacy/helper.php
View File

@ -558,7 +558,8 @@ class OC_Helper {
|| $storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage') || $storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')
) { ) {
/** @var \OC\Files\Storage\Home $storage */ /** @var \OC\Files\Storage\Home $storage */
$user = $storage->getUser(); $userInstance = $storage->getUser();
$user = ($userInstance === null) ? null : $userInstance->getUID();
} else { } else {
$user = \OC::$server->getUserSession()->getUser()->getUID(); $user = \OC::$server->getUserSession()->getUser()->getUID();
} }