aboutsummaryrefslogtreecommitdiffstats
path: root/include/Photo.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-07-10 06:28:02 -0700
committerfriendica <info@friendica.com>2012-07-10 06:28:02 -0700
commit94fabe3a2942ca93b436694f180f8eb2a72df918 (patch)
tree37333905f9d0b0c3a3d0fdf4366d4720cee9e680 /include/Photo.php
parent1215de575d9cda66b434f21dafdf44f986638b71 (diff)
downloadvolse-hubzilla-94fabe3a2942ca93b436694f180f8eb2a72df918.tar.gz
volse-hubzilla-94fabe3a2942ca93b436694f180f8eb2a72df918.tar.bz2
volse-hubzilla-94fabe3a2942ca93b436694f180f8eb2a72df918.zip
upstream fixes and a lot of taxonomy stuff
Diffstat (limited to 'include/Photo.php')
-rw-r--r--include/Photo.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/Photo.php b/include/Photo.php
index 3af1691ee..ba4241a7b 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -143,7 +143,7 @@ class Photo {
public function orient($filename) {
// based off comment on http://php.net/manual/en/function.imagerotate.php
- if(! function_exists('exif_read_data'))
+ if( (! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg') )
return;
$exif = exif_read_data($filename);