From befed183e501ef0776cccd3f9ce907fc3dc15ee6 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Thu, 11 Aug 2016 19:45:19 +0200 Subject: [PATCH] [stable9.1] Merge pull request #25652 from owncloud/fix-getQuota-on-null Ensure the user exists before calling a method on it --- lib/private/legacy/util.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php index f34fef7d06dc..06cd1bee4cec 100644 --- a/lib/private/legacy/util.php +++ b/lib/private/legacy/util.php @@ -164,6 +164,7 @@ public static function setupFS($user = '') { // install storage availability wrapper, before most other wrappers \OC\Files\Filesystem::addStorageWrapper('oc_availability', function ($mountPoint, $storage) { + /** @var \OCP\Files\Storage $storage */ if (!$storage->instanceOfStorage('\OC\Files\Storage\Shared') && !$storage->isLocal()) { return new \OC\Files\Storage\Wrapper\Availability(['storage' => $storage]); } @@ -289,16 +290,19 @@ public static function isDefaultExpireDateEnforced() { /** * Get the quota of a user * - * @param string $user + * @param string $userId * @return int Quota bytes */ - public static function getUserQuota($user) { - $userQuota = \OC::$server->getUserManager()->get($user)->getQuota(); + public static function getUserQuota($userId) { + $user = \OC::$server->getUserManager()->get($userId); + if (is_null($user)) { + return \OCP\Files\FileInfo::SPACE_UNLIMITED; + } + $userQuota = $user->getQuota(); if($userQuota === 'none') { return \OCP\Files\FileInfo::SPACE_UNLIMITED; - }else{ - return OC_Helper::computerFileSize($userQuota); } + return OC_Helper::computerFileSize($userQuota); } /**