Changeset 37245

Timestamp:

04/19/2016 08:45:35 PM (9 years ago)

Author:

ocean90

Message:

Media: Resolve fatal error on resize with ImageMagick < 6.4.6

Improper checking for 'Imagick::ALPHACHANNEL_UNDEFINED' and
'Imagick::ALPHACHANNEL_OPAQUE' caused fatal errors for some users
with Imagick when compiled against ImageMagick < 6.4.6, when these
constants were introduced. Fixes these compatibility checks.

Merge of [37192] to the 4.5 branch.

Props gblsm.
Fixes #36501.

Location:

branches/4.5

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-image-editor-imagick.php (modified) (1 diff)

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

@@ -377 +377 @@
             if ( is_callable( array( $this->image, 'getImageAlphaChannel' ) )
                 && is_callable( array( $this->image, 'setImageAlphaChannel' ) )
-                && defined( Imagick::ALPHACHANNEL_UNDEFINED )
-                && defined( Imagick::ALPHACHANNEL_OPAQUE )
+                && defined( 'Imagick::ALPHACHANNEL_UNDEFINED' )
+                && defined( 'Imagick::ALPHACHANNEL_OPAQUE' )
             ) {
                 if ( $this->image->getImageAlphaChannel() === Imagick::ALPHACHANNEL_UNDEFINED ) {