diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-11-05 12:06:59 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-11-05 12:06:59 +0100 |
| commit | 1147dc977422e827a201fa081abd07721231d072 (patch) | |
| tree | 203d47297c49545a67bbdd98cbe137b255a5d6d8 /lib/image.php | |
| parent | 88b91a7304f2de998f71a674f4f62e85f5b83e54 (diff) | |
| parent | 135680e50bf760d55a1bcaaaa02f959bde396c52 (diff) | |
| download | nextcloud-server-1147dc977422e827a201fa081abd07721231d072.tar.gz nextcloud-server-1147dc977422e827a201fa081abd07721231d072.zip | |
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
lib/vcategories.php
Diffstat (limited to 'lib/image.php')
| -rw-r--r-- | lib/image.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/image.php b/lib/image.php index 38acf00d9fe..41cd9081690 100644 --- a/lib/image.php +++ b/lib/image.php @@ -271,7 +271,7 @@ class OC_Image { return -1; } if(is_null($this->filepath) || !is_readable($this->filepath)) { - OC_Log::write('core','OC_Image->fixOrientation() No readable file path set.', OC_Log::DEBUG); + OC_Log::write('core', 'OC_Image->fixOrientation() No readable file path set.', OC_Log::DEBUG); return -1; } $exif = @exif_read_data($this->filepath, 'IFD0'); |