wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #11200 from owncloud/preview_better_errorhandling

Browse source 
make sure preview prop is instanceof OC_Image before using it in showPreview
This commit is contained in:
Morris Jobke 2014-09-21 22:44:07 +02:00
commit b622fa502e
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/preview.php
View file

@ -548,7 +548,9 @@ class Preview {
if (is_null($this->preview)) {
$this->getPreview();
}
$this->preview->show($mimeType);
if ($this->preview instanceof \OC_Image) {
$this->preview->show($mimeType);
}
}
/**