From: Georg Ehrke <developer@georgehrke.com>
Date: Wed, 10 Jul 2013 11:38:42 +0000 (+0200)
Subject: fix orientation before caching preview
X-Git-Tag: v6.0.0alpha2~235^2~77
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=45d16916718ea103b371da9c7bef0385717d8cef;p=nextcloud-server.git

fix orientation before caching preview
---

diff --git a/lib/preview.php b/lib/preview.php
index f12107c9f57..6173fc8aa6b 100755
--- a/lib/preview.php
+++ b/lib/preview.php
@@ -332,7 +332,7 @@ class Preview {
 
 				$preview = $provider->getThumbnail($file, $maxX, $maxY, $scalingup, $this->fileview);
 
-				if(!$preview) {
+				if(!($preview instanceof \OC_Image)) {
 					continue;
 				}
 
@@ -346,6 +346,8 @@ class Preview {
 				if($this->userview->is_dir(self::THUMBNAILS_FOLDER . '/' . $fileid . '/') === false) {
 					$this->userview->mkdir(self::THUMBNAILS_FOLDER . '/' . $fileid . '/');
 				}
+
+				$preview->fixOrientation();
 				$this->userview->file_put_contents($cachepath, $preview->data());
 
 				break;
@@ -382,8 +384,6 @@ class Preview {
 	 * @return image
 	*/
 	public function resizeAndCrop() {
-		$this->preview->fixOrientation();
-
 		$image = $this->preview;
 		$x = $this->maxX;
 		$y = $this->maxY;