Media: Remove the variable number (from the big image threshold value) when generating file names for scaled images. This makes it easier to "calculate" the full size file name from the name of an intermediate size image.

Props ianmjones, azaozz.
Fixes #48453 for trunk.
Built from https://develop.svn.wordpress.org/trunk@46658


git-svn-id: http://core.svn.wordpress.org/trunk@46458 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/includes/image.php

@@ -276,9 +276,9 @@ function wp_create_image_subsizes( $file, $attachment_id ) {
 		}
 
 		if ( ! is_wp_error( $resized ) ) {
-			// Append the threshold size to the image file name. It will look like "my-image-scaled-2560.jpg".
+			// Append "-scaled" to the image file name. It will look like "my_image-scaled.jpg".
 			// This doesn't affect the sub-sizes names as they are generated from the original image (for best quality).
-			$saved = $editor->save( $editor->generate_filename( 'scaled-' . $threshold ) );
+			$saved = $editor->save( $editor->generate_filename( 'scaled' ) );
 
 			if ( ! is_wp_error( $saved ) ) {
 				$image_meta = _wp_image_meta_replace_original( $saved, $file, $image_meta, $attachment_id );

wp-includes/version.php

@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4-alpha-46657';
+$wp_version = '5.4-alpha-46658';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.