Changeset 43749

Timestamp:

10/18/2018 04:13:36 AM (7 years ago)

Author:

SergeyBiryukov

Message:

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

Merges [42878] to the 5.0 branch.
See #43624.

Location:

branches/5.0

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/image.php (modified) (3 diffs)

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

@@ -344 +344 @@
         return false;
 
-    list( , , $sourceImageType ) = @getimagesize( $file );
+    list( , , $image_type ) = @getimagesize( $file );
 
     /*
@@ -428 +428 @@
      * @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 );
 
@@ -507 +509 @@
      * @since 4.4.0 The `$iptc` parameter was added.
      *
-     * @param array  $meta            Image meta data.
-     * @param string $file            Path to image file.
-     * @param int    $sourceImageType Type of image.
-     * @param array  $iptc            IPTC data.
+     * @param array  $meta       Image meta data.
+     * @param string $file       Path to image file.
+     * @param int    $image_type Type of image, one of the `IMAGETYPE_XXX` constants.
+     * @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 );
 
 }