Merge pull request #11200 from owncloud/preview_better_errorhandling

make sure preview prop is instanceof OC_Image before using it in showPreview
12 years ago · b622fa502e
parent 69726d951e 071e4bfc06
commit b622fa502e
1 changed files with 3 additions and 1 deletions
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@ -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);
+		}
 	}

 	/**