diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/ajax/download.php | 2 | ||||
| -rw-r--r-- | apps/files/css/files.css | 2 | ||||
| -rw-r--r-- | apps/files_versions/lib/versions.php | 7 |
3 files changed, 7 insertions, 4 deletions
diff --git a/apps/files/ajax/download.php b/apps/files/ajax/download.php index 7c8dcb372e2..b2bfd53506d 100644 --- a/apps/files/ajax/download.php +++ b/apps/files/ajax/download.php @@ -35,7 +35,7 @@ $dir = $_GET["dir"]; $files_list = json_decode($files); // in case we get only a single file -if ($files_list === NULL ) { +if (!is_array($files_list)) { $files_list = array($files); } diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 117aac4c93e..86fb0dc6046 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -114,7 +114,7 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; } position:relative; width:100%; -webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms; } -#select_all { float:left; margin:.3em 0.6em 0 .5em; } +#select_all { float:left; margin:.4em 0.6em 0 .5em; } #uploadsize-message,#delete-confirm { display:none; } /* File actions */ 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; } |