diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-02-06 17:47:13 +0100 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-02-06 17:47:13 +0100 |
| commit | 5ab12a8b85855ff01f4a3006a71ada2227d2a05a (patch) | |
| tree | 7e4c49dfe263a8970164d52f7347a4abf6120eec /lib | |
| parent | 0d94da7e9ef9550c8ae0244b203ca84e5ee007b0 (diff) | |
| parent | 6f21da12e8c953bebdbd444460b07160821ba7a8 (diff) | |
| download | nextcloud-server-5ab12a8b85855ff01f4a3006a71ada2227d2a05a.tar.gz nextcloud-server-5ab12a8b85855ff01f4a3006a71ada2227d2a05a.zip | |
Merge pull request #6445 from owncloud/fix_5956
fix issue with logging non utf8 chars
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/image.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/image.php b/lib/private/image.php index 7761a3c7737..91a9f91e1d6 100644 --- a/lib/private/image.php +++ b/lib/private/image.php @@ -409,14 +409,14 @@ class OC_Image { /** * @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 */ 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)) { // 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; } $iType = exif_imagetype($imagePath); |