Changeset 35479 for trunk/src/wp-includes/media.php

Timestamp:

10/31/2015 08:49:26 PM (11 years ago)

Author:

wonderboymusic

Message:

Media: add a new image size, medium_large. Bumps db version to add new options.

Adds unit tests.

Props DH-Shredder, joemcgill, azaozz.
Fixes #34196.

File:

• trunk/src/wp-includes/media.php (modified) (5 diffs)

trunk/src/wp-includes/media.php

@@ -15 +15 @@
  * values are 'thumb' or 'thumbnail' for the given thumbnail size or defaults at
  * 128 width and 96 height in pixels. Also supported for the string value is
- * 'medium' and 'full'. The 'full' isn't actually supported, but any value other
+ * 'medium', 'medium_large' and 'full'. The 'full' isn't actually supported, but any value other
  * than the supported will result in the content_width size or 500 if that is
  * not set.
@@ -61 +61 @@
                 $max_width = intval(get_option('medium_size_w'));
                 $max_height = intval(get_option('medium_size_h'));
-                // if no width is set, default to the theme content width if available
+
+        }
+        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' ) {
@@ -72 +80 @@
                 $max_width = intval(get_option('large_size_w'));
                 $max_height = intval(get_option('large_size_h'));
-                if ( intval($content_width) > 0 )
+                if ( intval($content_width) > 0 ) {
                         $max_width = min( intval($content_width), $max_width );
+                }
         } elseif ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
                 $max_width = intval( $_wp_additional_image_sizes[$size]['width'] );
@@ -707 +716 @@
 function get_intermediate_image_sizes() {
         global $_wp_additional_image_sizes;
-        $image_sizes = array('thumbnail', 'medium', 'large'); // Standard sizes
+        $image_sizes = array('thumbnail', 'medium', 'medium_large', 'large'); // Standard sizes
         if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) )
                 $image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
@@ -717 +726 @@
          *
          * @param array $image_sizes An array of intermediate image sizes. Defaults
-         *                           are 'thumbnail', 'medium', 'large'.
+         *                           are 'thumbnail', 'medium', 'medium_large', 'large'.
          */
         return apply_filters( 'intermediate_image_sizes', $image_sizes );