[stable9] Merge pull request #25652 from owncloud/fix-getQuota-on-null

Ensure the user exists before calling a method on it

diff --git a/lib/private/util.php b/lib/private/util.php
index d53a6ca9864ebfa1550535aba13b69f0bbf3c73c..8ff3db72cf9383fadfa513cbe3ca8d704c5cb2f1 100644 (file)
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -282,16 +282,19 @@ class OC_Util {
        /**
         * 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);
        }
 
        /**