From cb71d2fe629c3cd31577f43044439edff2d35168 Mon Sep 17 00:00:00 2001 From: azaozz Date: Sat, 2 Jun 2012 01:39:00 +0000 Subject: [PATCH] Fix notice in wp_read_image_metadata() when EXIF ISOSpeedRatings is array, props nacin, fixes #20807 git-svn-id: http://core.svn.wordpress.org/trunk@20978 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/image.php | 6 ++++-- wp-includes/js/plupload/handlers.dev.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php index a78c180440..0a5cf1817f 100644 --- a/wp-admin/includes/image.php +++ b/wp-admin/includes/image.php @@ -319,8 +319,10 @@ function wp_read_image_metadata( $file ) { $meta['created_timestamp'] = wp_exif_date2ts($exif['DateTimeDigitized'] ); if ( ! empty($exif['FocalLength'] ) ) $meta['focal_length'] = wp_exif_frac2dec( $exif['FocalLength'] ); - if ( ! empty($exif['ISOSpeedRatings'] ) ) - $meta['iso'] = utf8_encode( trim( $exif['ISOSpeedRatings'] ) ); + if ( ! empty($exif['ISOSpeedRatings'] ) ) { + $meta['iso'] = is_array( $exif['ISOSpeedRatings'] ) ? reset( $exif['ISOSpeedRatings'] ) : $exif['ISOSpeedRatings']; + $meta['iso'] = utf8_encode( trim( $meta['iso'] ) ); + } if ( ! empty($exif['ExposureTime'] ) ) $meta['shutter_speed'] = wp_exif_frac2dec( $exif['ExposureTime'] ); } diff --git a/wp-includes/js/plupload/handlers.dev.js b/wp-includes/js/plupload/handlers.dev.js index faabdf5042..0a631d61dd 100644 --- a/wp-includes/js/plupload/handlers.dev.js +++ b/wp-includes/js/plupload/handlers.dev.js @@ -417,7 +417,7 @@ jQuery(document).ready(function($){ setResize( getUserSetting('upload_resize', false) ); - if ( up.features.dragdrop ) { + if ( up.features.dragdrop && ! $(document.body).hasClass('mobile') ) { uploaddiv.addClass('drag-drop'); $('#drag-drop-area').bind('dragover.wp-uploader', function(){ // dragenter doesn't fire right :( uploaddiv.addClass('drag-over');