Ticket #28634: 28634.6.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 {
@@ -662 +655 @@
          * @return true|WP_Error True if stripping metadata was successful. WP_Error object on error.
          */
         protected function strip_meta() {
+
+                static $profiles = array();
+
+                /**
+                 * Filter the list of image profile types that are not stripped.
+                 *
+                 * This filter only applies when resizing using the Imagick editor since GD
+                 * strips all profiles by default.
+                 *
+                 * @since 4.5.0
+                 *
+                 * @param array $protected_profiles Array of protected profile types. Default 'icc' and 'iptc'.
+                 */
+                $protected_profiles = apply_filters( 'image_protected_profiles', array(
+                        'icc',
+                        'iptc',
+                ) );
+
                 try {
-                        // Strip profiles.
-                        foreach ( $this->image->getImageProfiles( '*', true ) as $key => $value ) {
-                                if ( $key != 'icc' && $key != 'icm' ) {
-                                        $this->image->removeImageProfile( $key );
-                                }
+                        // Save profiles before stripping if any our protected.
+                        if ( empty( $profiles ) && ! empty( $protected_profiles ) ) {
+                                $profiles = $this->image->getImageProfiles( '*', 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', '' );
+                        $this->image->stripImage();
+
+                        // Loop through protected profile types and write them back to the image.
+                        foreach ( $protected_profiles as $profile_type ) {
+                                if ( ! empty( $profiles[$profile_type] ) ) {
+                                        $this->image->profileImage( $profile_type, $profiles[$profile_type] );
+                                }
                         }
-                } catch ( Exception $e ) {
+
+                }
+                catch ( Exception $e ) {
                         return new WP_Error( 'image_strip_meta_error', $e->getMessage() );
                 }