diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-02-07 23:29:26 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-02-07 23:29:26 +0100 |
| commit | 8ad3fc89bed6b52b0f40095834b3b61b36d7c71c (patch) | |
| tree | fbb1d0ecf7f9ce6241c9265431686f89bd0014df /lib/private/image.php | |
| parent | f830ad0e47df14e821161c49ab1b52694f74912a (diff) | |
| parent | 91254c304d454b6f7977037dbd5dd2db5e00ff9f (diff) | |
| download | nextcloud-server-8ad3fc89bed6b52b0f40095834b3b61b36d7c71c.tar.gz nextcloud-server-8ad3fc89bed6b52b0f40095834b3b61b36d7c71c.zip | |
Merge branch 'master' into quota-space-root
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 a6a2413f59f..62d2a1f0fff 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); |