Changeset 48905 for trunk

Timestamp:

08/28/2020 04:43:31 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Media: Make the is_gd_image() function available on front end.

This avoids a fatal error if a plugin calls image creation or editing functions like wp_imagecreatetruecolor() outside of the admin.

Follow-up to [48798]

Props BackuPs.
Fixes #51174. See #50833.

Location:

trunk/src

Files:

• wp-admin/includes/image.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)

trunk/src/wp-admin/includes/image.php

@@ -914 +914 @@
 
 /**
- * Determines whether the value is an acceptable type for GD image functions.
- *
- * In PHP 8.0, the GD extension uses GdImage objects for its data structures.
- * This function checks if the passed value is either a resource of type `gd`
- * or a GdImage object instance. Any other type will return false.
- *
- * @since 5.6.0
- *
- * @param resource|GdImage|false $image A value to check the type for.
- * @return bool True if $image is either a GD image resource or GdImage instance,
- *              false otherwise.
- */
-function is_gd_image( $image ) {
-    if ( is_resource( $image ) && 'gd' === get_resource_type( $image )
-        || is_object( $image ) && $image instanceof GdImage
-    ) {
-        return true;
-    }
-
-    return false;
-}
-
-/**
  * Load an image resource for editing.
  *

trunk/src/wp-includes/media.php

@@ -3460 +3460 @@
 
 /**
+ * Determines whether the value is an acceptable type for GD image functions.
+ *
+ * In PHP 8.0, the GD extension uses GdImage objects for its data structures.
+ * This function checks if the passed value is either a resource of type `gd`
+ * or a GdImage object instance. Any other type will return false.
+ *
+ * @since 5.6.0
+ *
+ * @param resource|GdImage|false $image A value to check the type for.
+ * @return bool True if $image is either a GD image resource or GdImage instance,
+ *              false otherwise.
+ */
+function is_gd_image( $image ) {
+    if ( is_resource( $image ) && 'gd' === get_resource_type( $image )
+        || is_object( $image ) && $image instanceof GdImage
+    ) {
+        return true;
+    }
+
+    return false;
+}
+
+/**
  * Create new GD image resource with transparency support
  *