Ticket #58309: 58309.diff

wp-admin/includes/class-pclzip.php

@@ -1170 +1170 @@
     // ----- 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 +1234 @@
       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

wp-includes/media.php

@@ -3759 +3759 @@
  */
 function is_gd_image( $image ) {
         if ( is_resource( $image ) && 'gd' === get_resource_type( $image )
-                || is_object( $image ) && $image instanceof GdImage
+                || $image instanceof GdImage
         ) {
                 return true;
         }