WordPress.org

Make WordPress Core

Changeset 50148


Ignore:
Timestamp:
02/02/2021 05:08:48 PM (9 months ago)
Author:
SergeyBiryukov
Message:

Media: Move wp_getimagesize() to wp-includes/media.php, for consistency with other media functions.

Follow-up to [50146].

See #49889.

Location:
trunk/src/wp-includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/functions.php

    r50146 r50148  
    78677867    return abs( (float) $expected - (float) $actual ) <= $precision;
    78687868}
    7869 
    7870 /**
    7871  * Allows PHP's getimagesize() to be debuggable when necessary.
    7872  *
    7873  * @since 5.7.0
    7874  *
    7875  * @param string $filename The file path.
    7876  * @param array $imageinfo Extended image information, passed by reference.
    7877  * @return array|false Array of image information or false on failure.
    7878  */
    7879 function wp_getimagesize( $filename, &$imageinfo = array() ) {
    7880     if (
    7881         // Skip when running unit tests.
    7882         ! defined( 'DIR_TESTDATA' )
    7883         &&
    7884         // Return without silencing errors when in debug mode.
    7885         defined( 'WP_DEBUG' ) && WP_DEBUG
    7886     ) {
    7887         return getimagesize( $filename, $imageinfo );
    7888     }
    7889 
    7890     /**
    7891      * Silencing notice and warning is intentional.
    7892      *
    7893      * getimagesize() has a tendency to generate errors, such as "corrupt JPEG data: 7191 extraneous bytes before
    7894      * marker", even when it's able to provide image size information.
    7895      *
    7896      * See https://core.trac.wordpress.org/ticket/42480
    7897      *
    7898      * phpcs:ignore WordPress.PHP.NoSilencedErrors
    7899      */
    7900     return @getimagesize( $filename, $imageinfo );
    7901 }
  • trunk/src/wp-includes/media.php

    r50146 r50148  
    16291629
    16301630    /**
    1631      * Filter the 'wp_image_src_get_dimensions' value.
     1631     * Filters the 'wp_image_src_get_dimensions' value.
    16321632     *
    16331633     * @since 5.7.0
     
    49634963    return $plupload_settings;
    49644964}
     4965
     4966/**
     4967 * Allows PHP's getimagesize() to be debuggable when necessary.
     4968 *
     4969 * @since 5.7.0
     4970 *
     4971 * @param string $filename  The file path.
     4972 * @param array  $imageinfo Extended image information, passed by reference.
     4973 * @return array|false Array of image information or false on failure.
     4974 */
     4975function wp_getimagesize( $filename, &$imageinfo = array() ) {
     4976    if (
     4977        // Skip when running unit tests.
     4978        ! defined( 'DIR_TESTDATA' )
     4979        &&
     4980        // Return without silencing errors when in debug mode.
     4981        defined( 'WP_DEBUG' ) && WP_DEBUG
     4982    ) {
     4983        return getimagesize( $filename, $imageinfo );
     4984    }
     4985
     4986    /*
     4987     * Silencing notice and warning is intentional.
     4988     *
     4989     * getimagesize() has a tendency to generate errors, such as
     4990     * "corrupt JPEG data: 7191 extraneous bytes before marker",
     4991     * even when it's able to provide image size information.
     4992     *
     4993     * See https://core.trac.wordpress.org/ticket/42480
     4994     *
     4995     * phpcs:ignore WordPress.PHP.NoSilencedErrors
     4996     */
     4997    return @getimagesize( $filename, $imageinfo );
     4998}
Note: See TracChangeset for help on using the changeset viewer.