Changeset 42450 for branches/4.9/src/wp-admin/includes/media.php

Timestamp:

01/15/2018 08:01:51 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Media: Bring consistency to getimagesize() error suppression.

Props chasewg, joemcgill, jeremyfelt.
Merges [42449] to the 4.9 branch.
Fixes #42480.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/media.php (modified) (2 diffs)

branches/4.9/src/wp-admin/includes/media.php

@@ -356 +356 @@
 
     // Use image exif/iptc data for title and caption defaults if possible.
-    } elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = @wp_read_image_metadata( $file ) ) {
+    } elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = wp_read_image_metadata( $file ) ) {
         if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
             $title = $image_meta['title'];
@@ -420 +420 @@
 
     // Use image exif/iptc data for title and caption defaults if possible.
-    if ( $image_meta = @wp_read_image_metadata($file) ) {
+    if ( $image_meta = wp_read_image_metadata( $file ) ) {
         if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
             $title = $image_meta['title'];