From 005d8e98706fc98d8dc5aa4927bb3ab0e6b00ac2 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <georg@ownCloud.com>
Date: Tue, 28 May 2013 10:21:02 +0200
Subject: [PATCH] update images.php
---
lib/preview/images.php | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/lib/preview/images.php b/lib/preview/images.php
index 52aad67ca8..a8f203528c 100644
--- a/lib/preview/images.php
+++ b/lib/preview/images.php
@@ -13,11 +13,20 @@ class OC_Preview_Image extends OC_Preview_Provider{
}
public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) {
- //new image object
- $image = new \OC_Image($fileview->fopen($path, 'r'));
+ //get fileinfo
+ $fileinfo = $fileview->getFileInfo($path);
+
+ //check if file is encrypted
+ if($fileinfo['encrypted'] === true){
+ $image = new \OC_Image($fileview->fopen($path, 'r'));
+ }else{
+ $image = new \OC_Image();
+ $image->loadFromFile($fileview->getLocalFile($path));
+ }
+
//check if image object is valid
if (!$image->valid()) return false;
-
+
return $image;
}
}
--
GitLab