Make WordPress Core


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.9

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

    r41215 r42450  
    344344        return false;
    345345
    346     list( , , $sourceImageType ) = getimagesize( $file );
     346    list( , , $sourceImageType ) = @getimagesize( $file );
    347347
    348348    /*
     
    373373     */
    374374    if ( is_callable( 'iptcparse' ) ) {
    375         getimagesize( $file, $info );
     375        @getimagesize( $file, $info );
    376376
    377377        if ( ! empty( $info['APP13'] ) ) {
    378             $iptc = iptcparse( $info['APP13'] );
     378            $iptc = @iptcparse( $info['APP13'] );
    379379
    380380            // Headline, "A brief synopsis of the caption."
Note: See TracChangeset for help on using the changeset viewer.