Ticket #44801: 44801.diff

src/wp-includes/default-filters.php

@@ -503 +503 @@
 // Media
 add_action( 'wp_playlist_scripts', 'wp_playlist_scripts' );
 add_action( 'customize_controls_enqueue_scripts', 'wp_plupload_default_settings' );
+add_filter( 'editor_max_image_size', 'wp_constrain_editor_max_image_size_to_content_width', 0, 3 );
 
 // Nav menu
 add_filter( 'nav_menu_item_id', '_nav_menu_item_id_use_once', 10, 2 );

src/wp-includes/media.php

@@ -43 +43 @@
  *
  * @since 2.5.0
  *
- * @global int   $content_width
- *
  * @param int          $width   Width of the image in pixels.
  * @param int          $height  Height of the image in pixels.
  * @param string|array $size    Optional. Image size. Accepts any valid image size, or an array
@@ -55 +53 @@
  * @return array Width and height of what the result image should resize to.
  */
 function image_constrain_size_for_editor( $width, $height, $size = 'medium', $context = null ) {
-        global $content_width;
-
         $_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
         if ( ! $context ) {
@@ -66 +62 @@
         if ( is_array( $size ) ) {
                 $max_width  = $size[0];
                 $max_height = $size[1];
-        } elseif ( $size == 'thumb' || $size == 'thumbnail' ) {
+        } elseif ( in_array( $size, array( 'thumb', 'thumbnail' ), true ) ) {
                 $max_width  = intval( get_option( 'thumbnail_size_w' ) );
                 $max_height = intval( get_option( 'thumbnail_size_h' ) );
                 // last chance thumbnail size defaults
@@ -74 +70 @@
                         $max_width  = 128;
                         $max_height = 96;
                 }
-        } elseif ( $size == 'medium' ) {
-                $max_width  = intval( get_option( 'medium_size_w' ) );
-                $max_height = intval( get_option( 'medium_size_h' ) );
-
-        } elseif ( $size == 'medium_large' ) {
-                $max_width  = intval( get_option( 'medium_large_size_w' ) );
-                $max_height = intval( get_option( 'medium_large_size_h' ) );
-
-                if ( intval( $content_width ) > 0 ) {
-                        $max_width = min( intval( $content_width ), $max_width );
-                }
-        } elseif ( $size == 'large' ) {
-                /*
-                 * We're inserting a large size image into the editor. If it's a really
-                 * big image we'll scale it down to fit reasonably within the editor
-                 * itself, and within the theme's content width if it's known. The user
-                 * can resize it in the editor if they wish.
-                 */
-                $max_width  = intval( get_option( 'large_size_w' ) );
-                $max_height = intval( get_option( 'large_size_h' ) );
-                if ( intval( $content_width ) > 0 ) {
-                        $max_width = min( intval( $content_width ), $max_width );
-                }
+        } elseif ( in_array( $size, array( 'medium', 'medium_large', 'large' ), true ) ) {
+                $max_width  = intval( get_option( $size . '_size_w' ) );
+                $max_height = intval( get_option( $size . '_size_h' ) );
         } elseif ( ! empty( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
                 $max_width  = intval( $_wp_additional_image_sizes[ $size ]['width'] );
                 $max_height = intval( $_wp_additional_image_sizes[ $size ]['height'] );
-                // Only in admin. Assume that theme authors know what they're doing.
-                if ( intval( $content_width ) > 0 && 'edit' === $context ) {
-                        $max_width = min( intval( $content_width ), $max_width );
-                }
         } // $size == 'full' has no constraint
         else {
                 $max_width  = $width;
@@ -4170 +4142 @@
                 'done' => $done,
         );
 }
+
+/**
+ * Constrains the maximum image size, taking the $content_width global into account.
+ *
+ * Theme authors may define a `$content_width` global to specify how wide the typical theme content is.
+ * This filter function accounts for that global, adjusting maximum image widths as follows:
+ *
+ * - For the 'medium_large' and 'large' sizes, use the minimum of the original maximum width and `$content_width`.
+ * - For custom image sizes, use the minimum of the original maximum width and `$content_width` if `$context` is 'edit'.
+ * - For all other sizes, do not change anything.
+ *
+ * @since 5.0.0
+ *
+ * @global int $content_width
+ *
+ * @param array        $max_image_size An array of the maximum width and height.
+ * @param string|array $size           Size of what the result image should be.
+ * @param string       $context        Context for what the resizing is for, either 'display' or 'edit'.
+ * @return array Filtered $max_image_size, with the width possibly adjusted.
+ */
+function wp_constrain_editor_max_image_size_to_content_width( $max_image_size, $size, $context ) {
+        global $content_width;
+
+        // Bail if no valid content width is set, or if $size is an array.
+        if ( intval( $content_width ) <= 0 || is_array( $size ) ) {
+                return $max_image_size;
+        }
+
+        switch ( $size ) {
+                case 'thumb':
+                case 'thumbnail':
+                case 'medium':
+                        break;
+                case 'medium_large':
+                case 'large':
+                        $max_image_size[0] = min( intval( $content_width ), $max_image_size[0] );
+                        break;
+                default:
+                        $additional_sizes = wp_get_additional_image_sizes();
+
+                        // Only in admin. Assume that theme authors know what they're doing.
+                        if ( isset( $additional_sizes[ $size ] ) && 'edit' === $context ) {
+                                $max_image_size[0] = min( intval( $content_width ), $max_image_size[0] );
+                        }
+        }
+
+        return $max_image_size;
+}