summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin/lib
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2015-09-21 11:41:26 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2015-09-21 12:41:19 +0200
commita174ba5a36cff8fa2230a0c10c849ddcdb71ded4 (patch)
treef1bcfcbcb83c794f7b884700acc4aab36e870e24 /apps/files_trashbin/lib
parent6006a03ef1361f8805c323627fb6d8e9c37be9cd (diff)
downloadnextcloud-server-a174ba5a36cff8fa2230a0c10c849ddcdb71ded4.tar.gz
nextcloud-server-a174ba5a36cff8fa2230a0c10c849ddcdb71ded4.zip
make sure to add the correct file size to the file info, otherwise we will not show the preview for every filetype
Diffstat (limited to 'apps/files_trashbin/lib')
-rw-r--r--apps/files_trashbin/lib/helper.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
index f51185712a9..0baa2b5414b 100644
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@ -65,11 +65,14 @@ class Helper
if (!\OC\Files\Filesystem::isIgnoredDir($entryName)) {
$id = $entryName;
if ($dir === '' || $dir === '/') {
+ $size = $view->filesize($id);
$pathparts = pathinfo($entryName);
$timestamp = substr($pathparts['extension'], 1);
$id = $pathparts['filename'];
+
} else if ($timestamp === null) {
// for subfolders we need to calculate the timestamp only once
+ $size = $view->filesize($dir . '/' . $id);
$parts = explode('/', ltrim($dir, '/'));
$timestamp = substr(pathinfo($parts[0], PATHINFO_EXTENSION), 1);
}
@@ -86,6 +89,7 @@ class Helper
'mimetype' => $view->is_dir($dir . '/' . $entryName) ? 'httpd/unix-directory' : \OC_Helper::getFileNameMimeType($id),
'type' => $view->is_dir($dir . '/' . $entryName) ? 'dir' : 'file',
'directory' => ($dir === '/') ? '' : $dir,
+ 'size' => $size,
);
if ($originalPath) {
$i['extraData'] = $originalPath.'/'.$id;