diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-08-17 13:15:22 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-08-17 13:15:22 +0200 |
| commit | cabe92ef1240e171a812f5822ac69b4d7742fd71 (patch) | |
| tree | 469e9089107d440da0c12c291abbd626d6d08b33 /apps/files_versions/lib | |
| parent | 7adfc27cafa6f94962a33c158af9c45e71e012c5 (diff) | |
| parent | d3e2f31adad5eeaf415154dd2fb88cb9fec0b3c1 (diff) | |
| download | nextcloud-server-cabe92ef1240e171a812f5822ac69b4d7742fd71.tar.gz nextcloud-server-cabe92ef1240e171a812f5822ac69b4d7742fd71.zip | |
Merge branch 'master' into decrypt_files_again
Conflicts:
apps/files_encryption/tests/keymanager.php
Diffstat (limited to 'apps/files_versions/lib')
| -rw-r--r-- | apps/files_versions/lib/versions.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index 7c75d70f79c..70b8f30be5c 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -101,8 +101,11 @@ class Storage { return false; } - // we should have a source file to work with - if (!$files_view->file_exists($filename)) { + // we should have a source file to work with, and the file shouldn't + // be empty + $fileExists = $files_view->file_exists($filename); + $fileSize = $files_view->filesize($filename); + if ($fileExists === false || $fileSize === 0) { return false; } |