diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-05-12 11:33:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-12 11:33:54 -0500 |
| commit | 3bf950307045c5d108d4f37aa2c4748d4127c8e2 (patch) | |
| tree | a867262a3e6edc16dde6f64fee841eb11f07f576 | |
| parent | 2289ccd0ec72c54772c77f143886e84363099885 (diff) | |
| parent | 51c55a867d78e3d6518d38ab2d5d15f1f2eb65cc (diff) | |
| download | nextcloud-server-3bf950307045c5d108d4f37aa2c4748d4127c8e2.tar.gz nextcloud-server-3bf950307045c5d108d4f37aa2c4748d4127c8e2.zip | |
Merge pull request #4816 from nextcloud/Ardinis-quota-files_external
Correctly calculate used space for quota with external storage
| -rw-r--r-- | lib/private/legacy/helper.php | 2 | ||||
| -rw-r--r-- | tests/lib/HelperStorageTest.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php index 9c4bc895fb9..6775fe99dcd 100644 --- a/lib/private/legacy/helper.php +++ b/lib/private/legacy/helper.php @@ -537,7 +537,7 @@ class OC_Helper { $includeExtStorage = \OC::$server->getSystemConfig()->getValue('quota_include_external_storage', false); if (!$rootInfo) { - $rootInfo = \OC\Files\Filesystem::getFileInfo($path, false); + $rootInfo = \OC\Files\Filesystem::getFileInfo($path, $includeExtStorage ? 'ext' : false); } if (!$rootInfo instanceof \OCP\Files\FileInfo) { throw new \OCP\Files\NotFoundException(); diff --git a/tests/lib/HelperStorageTest.php b/tests/lib/HelperStorageTest.php index e27d5eca21d..d42c43c5ab8 100644 --- a/tests/lib/HelperStorageTest.php +++ b/tests/lib/HelperStorageTest.php @@ -158,9 +158,9 @@ class HelperStorageTest extends \Test\TestCase { $config->setSystemValue('quota_include_external_storage', 'true'); $storageInfo = \OC_Helper::getStorageInfo(''); - $this->assertEquals(12, $storageInfo['free']); - $this->assertEquals(5, $storageInfo['used']); - $this->assertEquals(17, $storageInfo['total']); + $this->assertEquals(12, $storageInfo['free'], '12 bytes free in home storage'); + $this->assertEquals(22, $storageInfo['used'], '5 bytes of home storage and 17 bytes of the temporary storage are used'); + $this->assertEquals(34, $storageInfo['total'], '5 bytes used and 12 bytes free in home storage as well as 17 bytes used in temporary storage'); $config->setSystemValue('quota_include_external_storage', $oldConfig); } |