Pass width & height to upload_image

clarifynl · Dec 22, 2023 · 1403f09 · 1403f09
1 parent 8c6f6eb
commit 1403f09
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/class-process.php b/src/class-process.php
@@ -547,7 +547,7 @@ public static function process_resize_request($id, $quality, $width, $height, $c
 					do_action('responsive_pics_file_saved_local', $id, $saved_file);
 
 					if (class_exists('Amazon_S3_And_CloudFront')) {
-						ResponsivePics()->s3offload->upload_image($id, $saved_file);
+						ResponsivePics()->s3offload->upload_image($id, $saved_file, round($width * $ratio), round($height * $ratio));
 					}
 				}
 			} else {

diff --git a/src/class-s3-offload.php b/src/class-s3-offload.php
@@ -17,7 +17,7 @@ public function __construct() {
 	/**
 	 * Upload to S3 storage
 	 */
-	public static function upload_image($id, $file = null) {
+	public static function upload_image($id, $file = null, $width = null, $height = null) {
 		global $as3cf;
 
 		$s3_upload = null;
@@ -28,7 +28,7 @@ public static function upload_image($id, $file = null) {
 			Media_Library_Item::init_cache();
 			$as3cf_item  = Media_Library_Item::get_by_source_id($id);
 
-			$size        = $file['width'] .'x'. $file['height'];
+			$size        = $width .'x'. $height;
 			$source_file = $file['file'];
 
 			if ($as3cf_item) {
@@ -131,7 +131,7 @@ public static function file_exists($id, $file) {
 			$height        = (int) $file['height'];
 
 			// Calculate size
-			$size          = ($width * $ratio) .'x'. ($height * $ratio);
+			$size          = round($width * $ratio) .'x'. round($height * $ratio);
 			$as3cf_objects = $as3cf_item ? $as3cf_item->objects() : null;
 			$size_exists   = $as3cf_objects ? array_key_exists($size, $as3cf_objects) : false;
 			$file_exists   = $size_exists ? ($file['file'] === $as3cf_objects[$size]['source_file']) : false;