Changeset 55935 for trunk/src/wp-admin/includes/image-edit.php

Timestamp:

06/18/2023 02:22:40 PM (20 months ago)

Author:

azaozz

Message:

Media: Deprecate the 'edit_custom_thumbnail_sizes' filter and disable the "Apply changes to [Thumbnail|All|All except thumbnail]" UI in the image editor. Add a (boolean) filter to reenable that UI.

Props peterwilsoncc, costdev, azaozz.
See: #57685.

File:

• trunk/src/wp-admin/includes/image-edit.php (modified) (8 diffs)

trunk/src/wp-admin/includes/image-edit.php

@@ -44 +44 @@
         }
     }
-    $edit_custom_sizes = false;
+
     /**
-     * Filters whether custom sizes are available options for image editing.
+     * Shows the settings in the Image Editor that allow selecting to edit only the thumbnail of an image.
      *
-     * @since 6.0.0
+     * @since 6.3.0
      *
-     * @param bool|string[] $edit_custom_sizes True if custom sizes can be edited or array of custom size names.
+     * @param bool Whether to show the settings in the Image Editor. Default false.
      */
-    $edit_custom_sizes = apply_filters( 'edit_custom_thumbnail_sizes', $edit_custom_sizes );
+    $edit_thumbnails_separately = (bool) apply_filters( 'image_edit_thumbnails_separately', false );
+
     ?>
     <div class="imgedit-wrap wp-clearfix">
@@ -273 +274 @@
 
     <?php
-    if ( $thumb && $sub_sizes ) {
+    if ( $edit_thumbnails_separately && $thumb && $sub_sizes ) {
         $thumb_img = wp_constrain_dimensions( $thumb['width'], $thumb['height'], 160, 120 );
         ?>
@@ -308 +309 @@
                     <label for="imgedit-target-thumbnail"><?php _e( 'Thumbnail' ); ?></label>
                 </span>
- 
+
                 <span class="imgedit-label">
                     <input type="radio" id="imgedit-target-nothumb" name="imgedit-target-<?php echo $post_id; ?>" value="nothumb" />
@@ -314 +315 @@
                 </span>
 
-                <?php
-                if ( $edit_custom_sizes ) {
-                    if ( ! is_array( $edit_custom_sizes ) ) {
-                        $edit_custom_sizes = get_intermediate_image_sizes();
-                    }
-                    foreach ( array_unique( $edit_custom_sizes ) as $key => $size ) {
-                        if ( array_key_exists( $size, $meta['sizes'] ) ) {
-                            if ( 'thumbnail' === $size ) {
-                                continue;
-                            }
-                            ?>
-                            <span class="imgedit-label">
-                            <input type="radio" id="imgedit-target-custom<?php echo esc_attr( $key ); ?>" name="imgedit-target-<?php echo $post_id; ?>" value="<?php echo esc_attr( $size ); ?>" />
-                                <label for="imgedit-target-custom<?php echo esc_attr( $key ); ?>"><?php echo esc_html( $size ); ?></label>
-                            </span>
-                            <?php
-                        }
-                    }
-                }
-                ?>
                 </fieldset>
             </div>
@@ -919 +900 @@
     $scale   = ! empty( $_REQUEST['do'] ) && 'scale' === $_REQUEST['do'];
 
+    /** This filter is documented in wp-admin/includes/image-edit.php */
+    $edit_thumbnails_separately = (bool) apply_filters( 'image_edit_thumbnails_separately', false );
+
     if ( $scale ) {
         $size = $img->get_size();
@@ -978 +962 @@
         isset( $backup_sizes['full-orig'] ) && $backup_sizes['full-orig']['file'] != $basename ) {
 
-        if ( 'thumbnail' === $target ) {
+        if ( $edit_thumbnails_separately && 'thumbnail' === $target ) {
             $new_path = "{$dirname}/{$filename}-temp.{$ext}";
         } else {
@@ -1028 +1012 @@
         $meta['height'] = $size['height'];
 
-        if ( $success ) {
+        if ( $success && ( 'nothumb' === $target || 'all' === $target ) ) {
             $sizes = get_intermediate_image_sizes();
-            if ( 'nothumb' === $target || 'all' === $target ) {
-                if ( 'nothumb' === $target ) {
-                    $sizes = array_diff( $sizes, array( 'thumbnail' ) );
-                }
-            } elseif ( 'thumbnail' !== $target ) {
-                $sizes = array_diff( $sizes, array( $target ) );
+
+            if ( $edit_thumbnails_separately && 'nothumb' === $target ) {
+                $sizes = array_diff( $sizes, array( 'thumbnail' ) );
             }
         }
@@ -1041 +1022 @@
         $return->fw = $meta['width'];
         $return->fh = $meta['height'];
-    } elseif ( 'thumbnail' === $target ) {
+    } elseif ( $edit_thumbnails_separately && 'thumbnail' === $target ) {
         $sizes   = array( 'thumbnail' );
         $success = true;
         $delete  = true;
         $nocrop  = true;
-    } else {
-        $sizes   = array( $target );
-        $success = true;
-        $delete  = true;
-        $nocrop  = $_wp_additional_image_sizes[ $size ]['crop'];
     }