From: kondou <kondou@ts.unde.re>
Date: Thu, 1 Aug 2013 19:01:26 +0000 (+0200)
Subject: Don't throw a fatal, if is_file() parameter isn't
X-Git-Tag: v6.0.0alpha2~366^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1b567b2ad1835d0c724309e68d3fad5dcc1b8bda;p=nextcloud-server.git

Don't throw a fatal, if is_file() parameter isn't

a 'valid path', but only a data/base64-string.

Related to #4283
---

diff --git a/lib/image.php b/lib/image.php
index c1b187608a6..4bc38e20e56 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -392,7 +392,7 @@ class OC_Image {
 	*/
 	public function loadFromFile($imagepath=false) {
 		// exif_imagetype throws "read error!" if file is less than 12 byte
-		if(!is_file($imagepath) || !file_exists($imagepath) || filesize($imagepath) < 12 || !is_readable($imagepath)) {
+		if(!@is_file($imagepath) || !file_exists($imagepath) || filesize($imagepath) < 12 || !is_readable($imagepath)) {
 			// Debug output disabled because this method is tried before loadFromBase64?
 			OC_Log::write('core', 'OC_Image->loadFromFile, couldn\'t load: '.$imagepath, OC_Log::DEBUG);
 			return false;