diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-02-21 15:43:54 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-02-21 15:43:54 +0100 |
| commit | f86dffd56c0971372900d1f4a9fba879e69952e7 (patch) | |
| tree | b00b49696fafcd763c8918a5f10e7f3d0b134ec0 /lib/private/files/storage | |
| parent | d1c392d9adc28f17ef90eb3e515f9622159c64b9 (diff) | |
| parent | aa0bcf7ba45d004b0c0226fd07696f9f224f9c1c (diff) | |
| download | nextcloud-server-f86dffd56c0971372900d1f4a9fba879e69952e7.tar.gz nextcloud-server-f86dffd56c0971372900d1f4a9fba879e69952e7.zip | |
Merge branch 'master' into recursive-mkdir-local
Diffstat (limited to 'lib/private/files/storage')
| -rw-r--r-- | lib/private/files/storage/wrapper/quota.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/files/storage/wrapper/quota.php b/lib/private/files/storage/wrapper/quota.php index 1bcdca7f47a..26c952e694a 100644 --- a/lib/private/files/storage/wrapper/quota.php +++ b/lib/private/files/storage/wrapper/quota.php @@ -16,11 +16,17 @@ class Quota extends Wrapper { protected $quota; /** + * @var string $sizeRoot + */ + protected $sizeRoot; + + /** * @param array $parameters */ public function __construct($parameters) { $this->storage = $parameters['storage']; $this->quota = $parameters['quota']; + $this->sizeRoot = isset($parameters['root']) ? $parameters['root'] : ''; } /** @@ -46,7 +52,7 @@ class Quota extends Wrapper { if ($this->quota < 0) { return $this->storage->free_space($path); } else { - $used = $this->getSize(''); + $used = $this->getSize($this->sizeRoot); if ($used < 0) { return \OC\Files\SPACE_NOT_COMPUTED; } else { |