Ticket #26381: 26381.2.diff

src/js/_enqueues/lib/image-edit.js

@@ -226 +226 @@
          */
         scaleChanged : function( postid, x, el ) {
                 var w = $('#imgedit-scale-width-' + postid), h = $('#imgedit-scale-height-' + postid),
-                warn = $('#imgedit-scale-warn-' + postid), w1 = '', h1 = '';
+                warn = $('#imgedit-scale-warn-' + postid), w1 = '', h1 = '',
+                scaleBtn = $('#imgedit-scale-button');
 
                 if ( false === this.validateNumeric( el ) ) {
                         return;
@@ -242 +243 @@
 
                 if ( ( h1 && h1 > this.hold.oh ) || ( w1 && w1 > this.hold.ow ) ) {
                         warn.css('visibility', 'visible');
+                        scaleBtn.prop('disabled', true);
                 } else {
                         warn.css('visibility', 'hidden');
+                        scaleBtn.prop('disabled', false);
                 }
         },
 

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

@@ -845 +845 @@
         $target  = ! empty( $_REQUEST['target'] ) ? preg_replace( '/[^a-z0-9_-]+/i', '', $_REQUEST['target'] ) : '';
         $scale   = ! empty( $_REQUEST['do'] ) && 'scale' === $_REQUEST['do'];
 
-        if ( $scale && $fwidth > 0 && $fheight > 0 ) {
+        if ( $scale ) {
                 $size = $img->get_size();
                 $sX   = $size['width'];
                 $sY   = $size['height'];
 
-                // Check if it has roughly the same w / h ratio.
-                $diff = round( $sX / $sY, 2 ) - round( $fwidth / $fheight, 2 );
-                if ( -0.1 < $diff && $diff < 0.1 ) {
-                        // Scale the full size image.
-                        if ( $img->resize( $fwidth, $fheight ) ) {
-                                $scaled = true;
-                        }
+                if ( $sX < $fwidth || $sY < $fheight ) {
+                        $return->error = esc_js( __( 'Images cannot be scaled to a size larger than the original.' ) );
+                        return $return;
                 }
 
-                if ( ! $scaled ) {
-                        $return->error = esc_js( __( 'Error while saving the scaled image. Please reload the page and try again.' ) );
-                        return $return;
+                if ( $fwidth > 0 && $fheight > 0 ) {
+                        // Check if it has roughly the same w / h ratio.
+                        $diff = round( $sX / $sY, 2 ) - round( $fwidth / $fheight, 2 );
+                        if ( -0.1 < $diff && $diff < 0.1 ) {
+                                // Scale the full size image.
+                                if ( $img->resize( $fwidth, $fheight ) ) {
+                                        $scaled = true;
+                                }
+                        }
+
+                        if ( ! $scaled ) {
+                                $return->error = esc_js( __( 'Error while saving the scaled image. Please reload the page and try again.' ) );
+                                return $return;
+                        }
                 }
         } elseif ( ! empty( $_REQUEST['history'] ) ) {
                 $changes = json_decode( wp_unslash( $_REQUEST['history'] ) );