mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4284 from owncloud/dont_fatal_on_is_file 

Don't throw a fatal, if is_file() parameter isn't a 'valid path', but only a data/base64-string.
This commit is contained in:
Thomas Tanghus 2013-08-02 04:38:26 -07:00
parent 895d9ba1b9 1b567b2ad1
commit c5c05b808c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/image.php
View File

@ -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;