Merge pull request #6674 from nextcloud/backport-6549-stable12

[stable12] don't pass User object when uid string is expected
This commit is contained in:
blizzz 2017-09-28 01:39:46 +02:00 committed by GitHub
commit b1d5acd15f
1 changed files with 2 additions and 1 deletions

View File

@ -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();
}