[Pkg-owncloud-commits] [owncloud] 23/52: detect mimetype from the original filename, without the versioning timestamp

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit bef510821880df95eefc9b908997d5fdca8d1cbc
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Thu Nov 28 18:59:38 2013 +0100

    detect mimetype from the original filename, without the versioning timestamp
---
 apps/files_versions/ajax/preview.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/files_versions/ajax/preview.php b/apps/files_versions/ajax/preview.php
index 62bcc03..3152502 100644
--- a/apps/files_versions/ajax/preview.php
+++ b/apps/files_versions/ajax/preview.php
@@ -37,8 +37,9 @@ if($maxX === 0 || $maxY === 0) {
 }
 
 try{
-	$preview = new \OC\Preview($user, 'files_versions');
-	$preview->setFile($file.'.v'.$version);
+	$preview = new \OC\Preview($user, 'files_versions', $file.'.v'.$version);
+	$mimetype = \OC_Helper::getFileNameMimeType($file);
+	$preview->setMimetype($mimetype);
 	$preview->setMaxX($maxX);
 	$preview->setMaxY($maxY);
 	$preview->setScalingUp($scalingUp);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git