mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8546 from owncloud/fix-preview-orientation-encrypted-master 

Rotate thumbnail when encryption is enabled
This commit is contained in:
Vincent Petry 2014-05-13 10:27:41 +02:00
parent a60db322c2 da0e37ef03
commit e3f6abf1f0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/private/preview/image.php
View File

@ -22,12 +22,13 @@ class Image extends Provider {
}
$image = new \OC_Image();
//check if file is encrypted
if($fileInfo['encrypted'] === true) {
$image->loadFromData(stream_get_contents($fileview->fopen($path, 'r')));
}else{
$image->loadFromFile($fileview->getLocalFile($path));
$fileName = $fileview->toTmpFile($path);
} else {
$fileName = $fileview->getLocalFile($path);
}
$image->loadFromFile($fileName);
return $image->valid() ? $image : false;
}