Changeset 25744

Timestamp:

10/09/2013 07:06:56 PM (11 years ago)

Author:

nacin

Message:

Make sure when resizing an image according to ratio we do not end up with a zero-pixel width or height.

props plocha.
fixes #25038.

Location:

trunk/src

Files:

• wp-admin/includes/image-edit.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)

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

@@ -468 +468 @@
 
     $ratio = _image_get_preview_ratio( $w, $h );
-    $w2 = $w * $ratio;
-    $h2 = $h * $ratio;
+    $w2 = max ( 1, $w * $ratio );
+    $h2 = max ( 1, $h * $ratio );
 
     if ( is_wp_error( $img->resize( $w2, $h2 ) ) )

trunk/src/wp-includes/media.php

@@ -285 +285 @@
         $ratio = $larger_ratio;
 
-    $w = intval( $current_width  * $ratio );
-    $h = intval( $current_height * $ratio );
+    // Very small dimensions may result in 0, 1 should be the minimum.
+    $w = max ( 1, intval( $current_width  * $ratio ) );
+    $h = max ( 1, intval( $current_height * $ratio ) );
 
     // Sometimes, due to rounding, we'll end up with a result like this: 465x700 in a 177x177 box is 117x176... a pixel short