Changeset 20978 for trunk/wp-admin/includes/image.php

Timestamp:

06/02/2012 01:39:00 AM (14 years ago)

Author:

azaozz

Message:

Fix notice in wp_read_image_metadata() when EXIF ISOSpeedRatings is array, props nacin, fixes #20807

File:

• trunk/wp-admin/includes/image.php (modified) (1 diff)

trunk/wp-admin/includes/image.php

@@ -320 +320 @@
                 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'] );