upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 18:21:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 41

Merge pull request #6675 from nextcloud/backport-6549-stable11

Browse source 
[stable11] don't pass User object when uid string is expected
This commit is contained in:
blizzz 2017-09-28 01:51:08 +02:00 committed by GitHub
commit 0589ceb220
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')
) {
/** @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();
}