Changeset 48798 for trunk/src/wp-includes/deprecated.php

Timestamp:

08/16/2020 01:31:57 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Introduce is_gd_image() to check for PHP 8 GdImage object instances.

In PHP 8, the GD extension uses GdImage objects instead of resources for its underlying data structures.

This updates the existing is_resource() calls for image resources in core to accomodate for GdImage instances as well.

Props ayeshrajans, jrf.
Fixes #50833.

File:

• trunk/src/wp-includes/deprecated.php (modified) (2 diffs)

trunk/src/wp-includes/deprecated.php

@@ -3197 +3197 @@
  *
  * @param string $file Filename of the image to load.
- * @return resource The resulting image resource on success, Error string on failure.
+ * @return resource|GdImage|string The resulting image resource or GdImage instance on success,
+ *                                 error string on failure.
  */
 function wp_load_image( $file ) {
@@ -3218 +3219 @@
     $image = imagecreatefromstring( file_get_contents( $file ) );
 
-    if ( ! is_resource( $image ) ) {
+    if ( ! is_gd_image( $image ) ) {
         /* translators: %s: File name. */
         return sprintf( __( 'File “%s” is not an image.' ), $file );