diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-15 02:03:27 +0400 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-15 02:03:27 +0400 |
| commit | 9fac95c2ab46a734607657bbad6f164aaa61286f (patch) | |
| tree | fc035f83bc812fd4b2f36427bb130ddabf71433e /lib/private/image.php | |
| parent | b330d07b51a983dc563a91244a3c83e691c9e97d (diff) | |
| parent | df282d9ef8e040833574fac5c5fd3cbbae1b3209 (diff) | |
Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
lib/private/appconfig.php
Diffstat (limited to 'lib/private/image.php')
| -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 54232234fe7..42afa35ea56 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); |