Merge pull request #8546 from owncloud/fix-preview-orientation-encrypted-master
Rotate thumbnail when encryption is enabled
This commit is contained in:
commit
e3f6abf1f0
|
@ -22,12 +22,13 @@ class Image extends Provider {
|
||||||
}
|
}
|
||||||
|
|
||||||
$image = new \OC_Image();
|
$image = new \OC_Image();
|
||||||
//check if file is encrypted
|
|
||||||
if($fileInfo['encrypted'] === true) {
|
if($fileInfo['encrypted'] === true) {
|
||||||
$image->loadFromData(stream_get_contents($fileview->fopen($path, 'r')));
|
$fileName = $fileview->toTmpFile($path);
|
||||||
}else{
|
} else {
|
||||||
$image->loadFromFile($fileview->getLocalFile($path));
|
$fileName = $fileview->getLocalFile($path);
|
||||||
}
|
}
|
||||||
|
$image->loadFromFile($fileName);
|
||||||
|
|
||||||
return $image->valid() ? $image : false;
|
return $image->valid() ? $image : false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue