Changeset 56250 for trunk/src/wp-includes/class-wp-image-editor-imagick.php

Timestamp:

07/17/2023 08:02:11 PM (15 months ago)

Author:

azaozz

Message:

Media: Stop using and deprecate set_imagick_time_limit(). Seems it causes more problems than it solves.

Follow-up to #52569 and [55404].

Props: dsar, antpb, audrasjb, SergeyBiryukov, hberberoglu, mtxz, densityapps, ekazda, matt_fw, soulseekah, mikeschroder, azaozz.

Fixes: #58202.

File:

• trunk/src/wp-includes/class-wp-image-editor-imagick.php (modified) (4 diffs)

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

@@ -269 +269 @@
      * point 1 above by aligning Imagick's timeout with PHP's timeout, assuming it is set.
      *
+     * However seems it introduces more problems than it fixes,
+     * see https://core.trac.wordpress.org/ticket/58202.
+     *
      * Note:
      *  - Imagick resource exhaustion does not issue catchable exceptions (yet).
@@ -276 +279 @@
      *
      * @since 6.2.0
+     * @since 6.3.0 This method was deprecated.
      *
      * @return int|null The new limit on success, null on failure.
      */
     public static function set_imagick_time_limit() {
+        _deprecated_function( __METHOD__, '6.3.0' );
+
         if ( ! defined( 'Imagick::RESOURCETYPE_TIME' ) ) {
             return null;
@@ -329 +335 @@
             return $this->crop( $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h );
         }
-
-        self::set_imagick_time_limit();
 
         // Execute the resize.
@@ -598 +602 @@
         }
 
-        self::set_imagick_time_limit();
-
         try {
             $this->image->cropImage( $src_w, $src_h, $src_x, $src_y );