diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-01-02 08:19:52 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-01-02 08:19:52 -0800 |
| commit | 1ce45713bd5e4928b2df1e1c88b8ca1dc98f1551 (patch) | |
| tree | 58af663a1da735890523db91b7d576134c882968 /lib | |
| parent | 27d7fff580454f34277baefa3f9fbd9542b458e5 (diff) | |
| parent | 25370fcb8235d2129cab0f8a5843c4784b3673d0 (diff) | |
| download | nextcloud-server-1ce45713bd5e4928b2df1e1c88b8ca1dc98f1551.tar.gz nextcloud-server-1ce45713bd5e4928b2df1e1c88b8ca1dc98f1551.zip | |
Merge pull request #6605 from owncloud/free_space_disabled
Return SPACE_UNKNOWN if disk_free_space is disabled
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/files/storage/local.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php index 02e8df4af4e..db3c6bfca3a 100644 --- a/lib/private/files/storage/local.php +++ b/lib/private/files/storage/local.php @@ -256,7 +256,7 @@ if (\OC_Util::runningOnWindows()) { public function free_space($path) { $space = @disk_free_space($this->datadir . $path); - if ($space === false) { + if ($space === false || is_null($space)) { return \OC\Files\SPACE_UNKNOWN; } return $space; |