Changeset 42450

Timestamp:

01/15/2018 08:01:51 PM (9 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/image.php (modified) (2 diffs)
• src/wp-admin/includes/media.php (modified) (2 diffs)
• src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php (modified) (1 diff)

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

@@ -344 +344 @@
                 return false;
 
-        list( , , $sourceImageType ) = getimagesize( $file );
+        list( , , $sourceImageType ) = @getimagesize( $file );
 
         /*
@@ -373 +373 @@
          */
         if ( is_callable( 'iptcparse' ) ) {
-                getimagesize( $file, $info );
+                @getimagesize( $file, $info );
 
                 if ( ! empty( $info['APP13'] ) ) {
-                        $iptc = iptcparse( $info['APP13'] );
+                        $iptc = @iptcparse( $info['APP13'] );
 
                         // Headline, "A brief synopsis of the caption."

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'];

branches/4.9/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php

@@ -124 +124 @@
 
                 // use image exif/iptc data for title and caption defaults if possible
-                $image_meta = @wp_read_image_metadata( $file );
+                $image_meta = wp_read_image_metadata( $file );
 
                 if ( ! empty( $image_meta ) ) {