wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix mimetype detection, introduce fake etag to identify preview images

Browse source
This commit is contained in:
Bjoern Schiessle 2014-03-03 12:23:21 +01:00
parent 4562909a20
commit 5ddabd7cd0
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/files_trashbin/lib/helper.php
View file

@ -41,7 +41,7 @@ class Helper
$result[] = array( $result[] = array(
'id' => $id, 'id' => $id,
'timestamp' => $timestamp, 'timestamp' => $timestamp,
'mime' => $view->getMimeType($dir . '/' . $entryName), 'mime' => \OC_Helper::getFileNameMimeType($id),
'type' => $view->is_dir($dir . '/' . $entryName) ? 'dir' : 'file', 'type' => $view->is_dir($dir . '/' . $entryName) ? 'dir' : 'file',
'location' => $dir, 'location' => $dir,
); );
@ -58,6 +58,7 @@ class Helper
$i['name'] = $r['id']; $i['name'] = $r['id'];
$i['date'] = \OCP\Util::formatDate($r['timestamp']); $i['date'] = \OCP\Util::formatDate($r['timestamp']);
$i['timestamp'] = $r['timestamp']; $i['timestamp'] = $r['timestamp'];
$i['etag'] = $r['timestamp']; // add fake etag, it is only needed to identify the preview image
$i['mimetype'] = $r['mime']; $i['mimetype'] = $r['mime'];
$i['type'] = $r['type']; $i['type'] = $r['type'];
if ($i['type'] === 'file') { if ($i['type'] === 'file') {