From 08377454778bb3566605a827d2a1f6d3729ffb88 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Mon, 18 Sep 2017 13:19:47 +0200 Subject: [PATCH] don't pass User object when uid string is expected Signed-off-by: Arthur Schiwon --- lib/private/legacy/helper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php index 48b7d037c5..dd4f13f7d7 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(); }