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

Merge pull request #6445 from owncloud/fix_5956 

fix issue with logging non utf8 chars
This commit is contained in:
Vincent Petry 2014-02-06 17:47:13 +01:00
parent 0d94da7e9e 6f21da12e8
commit 5ab12a8b85
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/image.php
View File

@ -409,14 +409,14 @@ class OC_Image {
/** /**
* @brief Loads an image from a local file. * @brief Loads an image from a local file.
* @param $imageref The path to a local file. * @param $imagePath The path to a local file.
* @returns An image resource or false on error * @returns An image resource or false on error
*/ */
public function loadFromFile($imagePath=false) { public function loadFromFile($imagePath=false) {
// exif_imagetype throws "read error!" if file is less than 12 byte // 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? // Debug output disabled because this method is tried before loadFromBase64?
OC_Log::write('core', 'OC_Image->loadFromFile, couldn\'t load: '.$imagePath, OC_Log::DEBUG); OC_Log::write('core', 'OC_Image->loadFromFile, couldn\'t load: ' . (string) urlencode($imagePath), OC_Log::DEBUG);
return false; return false;
} }
$iType = exif_imagetype($imagePath); $iType = exif_imagetype($imagePath);