Changeset 50148

Timestamp:

02/02/2021 05:08:48 PM (4 years 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:

• functions.php (modified) (1 diff)
• media.php (modified) (2 diffs)

trunk/src/wp-includes/functions.php

@@ -7867 +7867 @@
     return abs( (float) $expected - (float) $actual ) <= $precision;
 }
-
-/**
- * Allows PHP's getimagesize() to be debuggable when necessary.
- *
- * @since 5.7.0
- *
- * @param string $filename The file path.
- * @param array $imageinfo Extended image information, passed by reference.
- * @return array|false Array of image information or false on failure.
- */
-function wp_getimagesize( $filename, &$imageinfo = array() ) {
-    if (
-        // Skip when running unit tests.
-        ! defined( 'DIR_TESTDATA' )
-        &&
-        // Return without silencing errors when in debug mode.
-        defined( 'WP_DEBUG' ) && WP_DEBUG
-    ) {
-        return getimagesize( $filename, $imageinfo );
-    }
-
-    /**
-     * Silencing notice and warning is intentional.
-     *
-     * getimagesize() has a tendency to generate errors, such as "corrupt JPEG data: 7191 extraneous bytes before
-     * marker", even when it's able to provide image size information.
-     *
-     * See https://core.trac.wordpress.org/ticket/42480
-     *
-     * phpcs:ignore WordPress.PHP.NoSilencedErrors
-     */
-    return @getimagesize( $filename, $imageinfo );
-}

trunk/src/wp-includes/media.php

@@ -1629 +1629 @@
 
     /**
-     * Filter the 'wp_image_src_get_dimensions' value.
+     * Filters the 'wp_image_src_get_dimensions' value.
      *
      * @since 5.7.0
@@ -4963 +4963 @@
     return $plupload_settings;
 }
+
+/**
+ * Allows PHP's getimagesize() to be debuggable when necessary.
+ *
+ * @since 5.7.0
+ *
+ * @param string $filename  The file path.
+ * @param array  $imageinfo Extended image information, passed by reference.
+ * @return array|false Array of image information or false on failure.
+ */
+function wp_getimagesize( $filename, &$imageinfo = array() ) {
+    if (
+        // Skip when running unit tests.
+        ! defined( 'DIR_TESTDATA' )
+        &&
+        // Return without silencing errors when in debug mode.
+        defined( 'WP_DEBUG' ) && WP_DEBUG
+    ) {
+        return getimagesize( $filename, $imageinfo );
+    }
+
+    /*
+     * Silencing notice and warning is intentional.
+     *
+     * getimagesize() has a tendency to generate errors, such as 
+     * "corrupt JPEG data: 7191 extraneous bytes before marker",
+     * even when it's able to provide image size information.
+     *
+     * See https://core.trac.wordpress.org/ticket/42480
+     *
+     * phpcs:ignore WordPress.PHP.NoSilencedErrors
+     */
+    return @getimagesize( $filename, $imageinfo );
+}