Changeset 56411

Timestamp:

08/18/2023 10:07:25 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Improve variable names in wp_save_image().

This resolves a few WPCS warnings:

Variable "$sX" is not in valid snake_case format, try "$s_x"
Variable "$sY" is not in valid snake_case format, try "$s_y"

The $sX and $sY variables are renamed to $original_width and $original_height, respectively.

Additionally, the $fwidth and $fheight variables are renamed to $full_width and $full_height, for clarity.

Follow-up to [11965], [22094], [56400].

See #58831.

File:

• trunk/src/wp-admin/includes/image-edit.php (modified) (3 diffs)

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

@@ -33 +33 @@
         $backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
         $can_restore  = false;
+
         if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) ) {
                 $can_restore = wp_basename( $meta['file'] ) !== $backup_sizes['full-orig']['file'];
@@ -898 +899 @@
         }
 
-        $fwidth  = ! empty( $_REQUEST['fwidth'] ) ? (int) $_REQUEST['fwidth'] : 0;
-        $fheight = ! empty( $_REQUEST['fheight'] ) ? (int) $_REQUEST['fheight'] : 0;
-        $target  = ! empty( $_REQUEST['target'] ) ? preg_replace( '/[^a-z0-9_-]+/i', '', $_REQUEST['target'] ) : '';
-        $scale   = ! empty( $_REQUEST['do'] ) && 'scale' === $_REQUEST['do'];
+        $full_width  = ! empty( $_REQUEST['fwidth'] ) ? (int) $_REQUEST['fwidth'] : 0;
+        $full_height = ! empty( $_REQUEST['fheight'] ) ? (int) $_REQUEST['fheight'] : 0;
+        $target      = ! empty( $_REQUEST['target'] ) ? preg_replace( '/[^a-z0-9_-]+/i', '', $_REQUEST['target'] ) : '';
+        $scale       = ! empty( $_REQUEST['do'] ) && 'scale' === $_REQUEST['do'];
 
         /** This filter is documented in wp-admin/includes/image-edit.php */
@@ -907 +908 @@
 
         if ( $scale ) {
-                $size = $img->get_size();
-                $sX   = $size['width'];
-                $sY   = $size['height'];
-
-                if ( $sX < $fwidth || $sY < $fheight ) {
+                $size            = $img->get_size();
+                $original_width  = $size['width'];
+                $original_height = $size['height'];
+
+                if ( $full_width > $original_width || $full_height > $original_height ) {
                         $return->error = esc_js( __( 'Images cannot be scaled to a size larger than the original.' ) );
                         return $return;
                 }
 
-                if ( $fwidth > 0 && $fheight > 0 ) {
+                if ( $full_width > 0 && $full_height > 0 ) {
                         // Check if it has roughly the same w / h ratio.
-                        $diff = round( $sX / $sY, 2 ) - round( $fwidth / $fheight, 2 );
+                        $diff = round( $original_width / $original_height, 2 ) - round( $full_width / $full_height, 2 );
                         if ( -0.1 < $diff && $diff < 0.1 ) {
                                 // Scale the full size image.
-                                if ( $img->resize( $fwidth, $fheight ) ) {
+                                if ( $img->resize( $full_width, $full_height ) ) {
                                         $scaled = true;
                                 }