Merge pull request #11200 from owncloud/preview_better_errorhandling

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

View File

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