diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-01-20 05:29:27 -0800 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-01-20 05:29:27 -0800 |
| commit | 62dd58aa190e5c53d8924e30a37dcc69f9495f6c (patch) | |
| tree | b6b454517ad96dee256e581028b71ef1a682204b /lib/private | |
| parent | f88360eba34df0fcdcde93d9887a7da054c8aeb6 (diff) | |
| parent | 1af7dab5358d7fd495e4382037c6e2528e2b76d5 (diff) | |
| download | nextcloud-server-62dd58aa190e5c53d8924e30a37dcc69f9495f6c.tar.gz nextcloud-server-62dd58aa190e5c53d8924e30a37dcc69f9495f6c.zip | |
Merge pull request #6838 from owncloud/core-quotawrapperfailedfopenfix
Fixed quota wrapper to not wrap failed fopen streams
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/files/storage/wrapper/quota.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/files/storage/wrapper/quota.php b/lib/private/files/storage/wrapper/quota.php index 43016e0892f..a430e3e4617 100644 --- a/lib/private/files/storage/wrapper/quota.php +++ b/lib/private/files/storage/wrapper/quota.php @@ -95,7 +95,7 @@ class Quota extends Wrapper { public function fopen($path, $mode) { $source = $this->storage->fopen($path, $mode); $free = $this->free_space(''); - if ($free >= 0 && $mode !== 'r') { + if ($source && $free >= 0 && $mode !== 'r' && $mode !== 'rb') { return \OC\Files\Stream\Quota::wrap($source, $free); } else { return $source; |