diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2017-09-28 01:39:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 01:39:46 +0200 |
| commit | b1d5acd15f905b704798d3c47c2a6b43d12e1b9e (patch) | |
| tree | 8f9e64df796794d9f3855a1a2fea60036c128c48 | |
| parent | f6ccc1e0a197db0664e082f3f6161cf5a4ca20c2 (diff) | |
| parent | 499da044b65635ee3f770d6df7ad34590a03c3fd (diff) | |
| download | nextcloud-server-b1d5acd15f905b704798d3c47c2a6b43d12e1b9e.tar.gz nextcloud-server-b1d5acd15f905b704798d3c47c2a6b43d12e1b9e.zip | |
Merge pull request #6674 from nextcloud/backport-6549-stable12
[stable12] don't pass User object when uid string is expected
| -rw-r--r-- | lib/private/legacy/helper.php | 3 |
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(); } |