diff --git a/wp-admin/includes/class-pclzip.php b/wp-admin/includes/class-pclzip.php index b1b39e2dfe..3f26dee2e4 100644 --- a/wp-admin/includes/class-pclzip.php +++ b/wp-admin/includes/class-pclzip.php @@ -1170,8 +1170,8 @@ // ----- Reset the error handler $this->privErrorReset(); - // ----- Look if the $p_archive is a PclZip object - if (is_object($p_archive) && $p_archive instanceof pclzip) + // ----- Look if the $p_archive is an instantiated PclZip object + if ($p_archive instanceof pclzip) { // ----- Duplicate the archive @@ -1234,8 +1234,8 @@ return(0); } - // ----- Look if the $p_archive_to_add is a PclZip object - if (is_object($p_archive_to_add) && $p_archive_to_add instanceof pclzip) + // ----- Look if the $p_archive_to_add is an instantiated PclZip object + if ($p_archive_to_add instanceof pclzip) { // ----- Merge the archive diff --git a/wp-includes/media.php b/wp-includes/media.php index 281e896fa0..0d22ada14e 100644 --- a/wp-includes/media.php +++ b/wp-includes/media.php @@ -3748,8 +3748,8 @@ function get_taxonomies_for_attachments( $output = 'names' ) { * 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. + * This function checks if the passed value is either a GdImage object instance + * or a resource of type `gd`. Any other type will return false. * * @since 5.6.0 * @@ -3758,8 +3758,8 @@ function get_taxonomies_for_attachments( $output = 'names' ) { * false otherwise. */ function is_gd_image( $image ) { - if ( is_resource( $image ) && 'gd' === get_resource_type( $image ) - || is_object( $image ) && $image instanceof GdImage + if ( $image instanceof GdImage + || is_resource( $image ) && 'gd' === get_resource_type( $image ) ) { return true; } diff --git a/wp-includes/version.php b/wp-includes/version.php index 0603649b00..09f31b34a9 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.3-alpha-55756'; +$wp_version = '6.3-alpha-55757'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.