[Pkg-owncloud-commits] [owncloud] 38/104: Return SPACE_UNKNOWN if disk_free_space is disabled when getting the free space on a local storage

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit f356ef90d73cd3b0d40d068065627b6ba1c8022f
Author: Robin Appelman <icewind at owncloud.com>
Date:   Thu Jan 2 13:19:10 2014 +0100

    Return SPACE_UNKNOWN if disk_free_space is disabled when getting the free space on a local storage
---
 lib/private/files/storage/local.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index 02e8df4..db3c6bf 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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git