Changeset 39633 for branches/4.7/src/wp-admin/includes/image.php

Timestamp:

12/21/2016 05:52:54 AM (9 years ago)

Author:

pento

Message:

Media: Allow PDF fallbacks filter to process custom sizes.

This fixes an oversight in [39246], which added a hook for filtering the array of sizes used for PDF thumbnails, but failed to provide a way for sizes added through add_image_size() to be processed.

Merge of [39617] to the 4.7 branch.

Props gitlost.
Fixes #39231. See #38594.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/image.php (modified) (1 diff)

branches/4.7/src/wp-admin/includes/image.php

@@ -222 +222 @@
 
         $sizes = array();
+        $_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
         foreach ( $fallback_sizes as $s ) {
-            $sizes[ $s ]['width']  = get_option( "{$s}_size_w" );
-            $sizes[ $s ]['height'] = get_option( "{$s}_size_h" );
-
-            // Force thumbnails to be soft crops.
-            if ( ! 'thumbnail' === $s ) {
-                $sizes[ $s ]['crop'] = get_option( "{$s}_crop" );
+            if ( isset( $_wp_additional_image_sizes[ $s ]['width'] ) ) {
+                $sizes[ $s ]['width'] = intval( $_wp_additional_image_sizes[ $s ]['width'] );
+            } else {
+                $sizes[ $s ]['width'] = get_option( "{$s}_size_w" );
+            }
+
+            if ( isset( $_wp_additional_image_sizes[ $s ]['height'] ) ) {
+                $sizes[ $s ]['height'] = intval( $_wp_additional_image_sizes[ $s ]['height'] );
+            } else {
+                $sizes[ $s ]['height'] = get_option( "{$s}_size_h" );
+            }
+
+            if ( isset( $_wp_additional_image_sizes[ $s ]['crop'] ) ) {
+                $sizes[ $s ]['crop'] = $_wp_additional_image_sizes[ $s ]['crop'];
+            } else {
+                // Force thumbnails to be soft crops.
+                if ( ! 'thumbnail' === $s ) {
+                    $sizes[ $s ]['crop'] = get_option( "{$s}_crop" );
+                }
             }
         }