Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 9 insertions, 2 deletions

diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index e63125671..6f508bf72 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -241,9 +241,9 @@ abstract class photo_driver {
 		if((! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg'))
 			return;
 
-		$exif = @exif_read_data($filename);
+		$exif = @exif_read_data($filename,null,true);
 		if($exif) {
-			$ort = $exif['Orientation'];
+			$ort = $exif['IFD0']['Orientation'];
 
 			switch($ort)
 			{
@@ -280,7 +280,14 @@ abstract class photo_driver {
 					$this->rotate(90);
 					break;
 			}
+
+			//			logger('exif: ' . print_r($exif,true));
+			return $exif;
+
 		}
+		
+		return false;
+
 	}