sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Media: In `wp_read_image_metadata()`, rename `$sourceImageType` variable to `$image_type` to match coding standards. 

See #43624.

git-svn-id: https://develop.svn.wordpress.org/trunk@42878 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2018-03-25 20:40:03 +00:00
parent cf400b9bc4
commit 0c2bbd4441
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wp-admin/includes/image.php
View File

@ -357,7 +357,7 @@ function wp_read_image_metadata( $file ) {
return false; return false;
} }
list( , , $sourceImageType ) = @getimagesize( $file ); list( , , $image_type ) = @getimagesize( $file );
/* /*
* EXIF contains a bunch of data we'll probably never need formatted in ways * EXIF contains a bunch of data we'll probably never need formatted in ways
@ -444,7 +444,9 @@ function wp_read_image_metadata( $file ) {
* *
* @param array $image_types Image types to check for exif data. * @param array $image_types Image types to check for exif data.
*/ */
if ( is_callable( 'exif_read_data' ) && in_array( $sourceImageType, apply_filters( 'wp_read_image_metadata_types', array( IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM ) ) ) ) { $exif_image_types = apply_filters( 'wp_read_image_metadata_types', array( IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM ) );
if ( is_callable( 'exif_read_data' ) && in_array( $image_type, $exif_image_types ) ) {
$exif = @exif_read_data( $file ); $exif = @exif_read_data( $file );
if ( ! empty( $exif['ImageDescription'] ) ) { if ( ! empty( $exif['ImageDescription'] ) ) {
@ -523,12 +525,12 @@ function wp_read_image_metadata( $file ) {
* @since 2.5.0 * @since 2.5.0
* @since 4.4.0 The `$iptc` parameter was added. * @since 4.4.0 The `$iptc` parameter was added.
* *
* @param array $meta Image meta data. * @param array $meta Image meta data.
* @param string $file Path to image file. * @param string $file Path to image file.
* @param int $sourceImageType Type of image. * @param int $image_type Type of image, one of the `IMAGETYPE_XXX` constants.
* @param array $iptc IPTC data. * @param array $iptc IPTC data.
*/ */
return apply_filters( 'wp_read_image_metadata', $meta, $file, $sourceImageType, $iptc ); return apply_filters( 'wp_read_image_metadata', $meta, $file, $image_type, $iptc );
} }