diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-08-17 20:13:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-17 20:13:56 +0200 |
| commit | 5aaa065d6d2fed5b0c2f03973391ffd91281a401 (patch) | |
| tree | 75a9896365c60541474672bfdae3cb1b929e0e49 /lib/private | |
| parent | 6585bae96b062c5f4cfb644bf372b34aa5998489 (diff) | |
| parent | 85d3fb76d7be8894964d98449f3d551a3bc7a810 (diff) | |
| download | nextcloud-server-5aaa065d6d2fed5b0c2f03973391ffd91281a401.tar.gz nextcloud-server-5aaa065d6d2fed5b0c2f03973391ffd91281a401.zip | |
Merge pull request #848 from nextcloud/public-link-quota
fix getting quota for public links with quota_include_external_storage
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/legacy/helper.php | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php index 62814e495d5..a5f410b87a4 100644 --- a/lib/private/legacy/helper.php +++ b/lib/private/legacy/helper.php @@ -588,7 +588,19 @@ class OC_Helper { $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(); |