Merge pull request nextcloud#848 from nextcloud/public-link-quota

fix getting quota for public links with quota_include_external_storage
GitHubUser4234 · Aug 17, 2016 · 2c870bc · 2c870bc
2 parents 6db8ffb + d01a233
commit 2c870bc
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php
@@ -588,7 +588,19 @@ public static function getStorageInfo($path, $rootInfo = null) {
 			$sourceStorage = $storage->getSourceStorage();
 		}
 		if ($includeExtStorage) {
-			$quota = OC_Util::getUserQuota(\OCP\User::getUser());
+			if ($storage->instanceOfStorage('\OC\Files\Storage\Home')
+				|| $storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')
+			) {
+				/** @var \OC\Files\Storage\Home $storage */
+				$user = $storage->getUser();
+			} else {
+				$user = \OC::$server->getUserSession()->getUser()->getUID();
+			}
+			if ($user) {
+				$quota = OC_Util::getUserQuota($user);
+			} else {
+				$quota = \OCP\Files\FileInfo::SPACE_UNLIMITED;
+			}
 			if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
 				// always get free space / total space from root + mount points
 				return self::getGlobalStorageInfo();