Changeset 50553 for branches/5.7

Timestamp:

03/19/2021 02:11:23 AM (4 years ago)

Author:

peterwilsoncc

Message:

Media: Pass the appropriate reference into wp_getimagesize.

With changes that were introduced in #49889 the second parameter for getimagesize() function is expecting a a reference.

Previously, most calls did not pass the 2nd param, and as a result, we are getting unexpected results.

This was only a problem with applications that are using a custom stream wrapper, and the image contained EXIF data.

For more see:

​https://github.com/humanmade/S3-Uploads/issues/496
​https://github.com/aws/aws-sdk-php/issues/1923

Fixes #52826.
Merges [50552] to the 5.7 branch.
Props terriann, SergeyBiryukov, Mista-Flo, hellofromTonya, rinatkhaziev, whyisjake.

Location:

branches/5.7

Files:

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

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

@@ -712 +712 @@
 
     $iptc = array();
+    $info = array();
     /*
      * Read IPTC first, since it might contain data not available in exif such

branches/5.7/src/wp-includes/media.php

@@ -4971 +4971 @@
  * @since 5.7.0
  *
- * @param string $filename  The file path.
- * @param array  $imageinfo Extended image information, passed by reference.
+ * @param string $filename   The file path.
+ * @param array  $image_info Optional. Extended image information (passed by reference).
  * @return array|false Array of image information or false on failure.
  */
-function wp_getimagesize( $filename, &$imageinfo = array() ) {
+function wp_getimagesize( $filename, array &$image_info = null ) {
     if (
         // Skip when running unit tests.
@@ -4983 +4983 @@
         defined( 'WP_DEBUG' ) && WP_DEBUG
     ) {
-        return getimagesize( $filename, $imageinfo );
+        return getimagesize( $filename, $image_info );
     }
 
@@ -4997 +4997 @@
      * phpcs:ignore WordPress.PHP.NoSilencedErrors
      */
-    return @getimagesize( $filename, $imageinfo );
-}
+    return @getimagesize( $filename, $image_info );
+}