Ticket #28634: 28634.5.diff

src/wp-includes/class-wp-image-editor-imagick.php

@@ -317 +317 @@
                  *
                  * @param bool $strip_meta Whether to strip image metadata during resizing. Default true.
                  */
-                $strip_meta = apply_filters( 'image_strip_meta', $strip_meta );
-
-                // Strip image meta.
-                if ( $strip_meta ) {
-                        $strip_result = $this->strip_meta();
-
-                        if ( is_wp_error( $strip_result ) ) {
-                                return $strip_result;
-                        }
+                if ( apply_filters( 'image_strip_meta', $strip_meta ) ) {
+                        $this->strip_meta();
                 }
 
                 try {
@@ -658 +651 @@
          *
          * @since 4.5.0
          * @access protected
-         *
-         * @return true|WP_Error True if stripping metadata was successful. WP_Error object on error.
          */
         protected function strip_meta() {
-                try {
-                        // Strip profiles.
-                        foreach ( $this->image->getImageProfiles( '*', true ) as $key => $value ) {
-                                if ( $key != 'icc' && $key != 'icm' ) {
-                                        $this->image->removeImageProfile( $key );
-                                }
-                        }
+                $profiles = $this->image->getImageProfiles( 'icc', true );
 
-                        // Strip image properties.
-                        if ( method_exists( $this->image, 'deleteImageProperty' ) ) {
-                                $this->image->deleteImageProperty( 'comment' );
-                                $this->image->deleteImageProperty( 'Thumb::URI' );
-                                $this->image->deleteImageProperty( 'Thumb::MTime' );
-                                $this->image->deleteImageProperty( 'Thumb::Size' );
-                                $this->image->deleteImageProperty( 'Thumb::Mimetype' );
-                                $this->image->deleteImageProperty( 'software' );
-                                $this->image->deleteImageProperty( 'Thumb::Image::Width' );
-                                $this->image->deleteImageProperty( 'Thumb::Image::Height' );
-                                $this->image->deleteImageProperty( 'Thumb::Document::Pages' );
-                        } else {
-                                $this->image->setImageProperty( 'comment', '' );
-                                $this->image->setImageProperty( 'Thumb::URI', '' );
-                                $this->image->setImageProperty( 'Thumb::MTime', '' );
-                                $this->image->setImageProperty( 'Thumb::Size', '' );
-                                $this->image->setImageProperty( 'Thumb::Mimetype', '' );
-                                $this->image->setImageProperty( 'software', '' );
-                                $this->image->setImageProperty( 'Thumb::Image::Width', '' );
-                                $this->image->setImageProperty( 'Thumb::Image::Height', '' );
-                                $this->image->setImageProperty( 'Thumb::Document::Pages', '' );
-                        }
-                } catch ( Exception $e ) {
-                        return new WP_Error( 'image_strip_meta_error', $e->getMessage() );
-                }
+                $this->image->stripImage();
 
-                return true;
+                if ( ! empty( $profiles ) ) {
+                        $this->image->profileImage( 'icc', $profiles['icc'] );
+                }
         }
 
 }