Deploying version 3.2.4

deliciousbrains · Jun 26, 2023 · a39fe91 · a39fe91
1 parent 5a21119
commit a39fe91
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 **Requires at least:** 5.5 \
 **Tested up to:** 6.2 \
 **Requires PHP:** 7.2 \
-**Stable tag:** 3.2.3 \
+**Stable tag:** 3.2.4 \
 **License:** GPLv3
 
 Copies files to Amazon S3, DigitalOcean Spaces or Google Cloud Storage as they are uploaded to the Media Library. Optionally configure Amazon CloudFront or another CDN for faster delivery.
@@ -103,6 +103,10 @@ This version requires PHP 5.3.3+ and the Amazon Web Services plugin
 
 ## Changelog
 
+### WP Offload Media Lite 3.2.4 - 2023-06-26
+
+* Bug fix: Newly added rotated images no longer fail to automatically offload
+
 ### WP Offload Media Lite 3.2.3 - 2023-06-13
 
 * Bug fix: Broken legacy amazonS3_info metadata no longer causes upgrade routines to fail

diff --git a/assets/css/settings.css b/assets/css/settings.css
diff --git a/assets/css/settings.min.css b/assets/css/settings.min.css
diff --git a/classes/integrations/media-library.php b/classes/integrations/media-library.php
@@ -153,10 +153,20 @@ function_exists( 'wp_get_missing_image_subsizes' ) &&
 			$new_sizes = wp_get_registered_image_subsizes();
 			$new_sizes = apply_filters( 'intermediate_image_sizes_advanced', $new_sizes, $data, $post_id );
 
-			// Some images, particularly SVGs, don't create thumbnails but do have
+			// If an image has been rotated, remove original image from metadata so that
+			// `wp_get_missing_image_subsizes()` doesn't use non-rotated image for
+			// generating missing thumbnail sizes.
+			// Also, some images, particularly SVGs, don't create thumbnails but do have
 			// metadata for them. At the time `wp_get_missing_image_subsizes()` checks
 			// the saved metadata, it isn't there, but we already have it.
 			$func = function ( $value, $object_id, $meta_key, $single, $meta_type ) use ( $post_id, $data ) {
+				if ( ! empty( $value['image_meta']['orientation'] ) ) {
+					unset( $value['original_image'] );
+				}
+				if ( ! empty( $data['image_meta']['orientation'] ) ) {
+					unset( $data['original_image'] );
+				}
+
 				if (
 					is_null( $value ) &&
 					$object_id === $post_id &&

diff --git a/languages/amazon-s3-and-cloudfront-en.pot b/languages/amazon-s3-and-cloudfront-en.pot
@@ -2,16 +2,16 @@
 # # This file is distributed under the same license as the amazon-s3-and-cloudfront package.
 msgid ""
 msgstr ""
-"Project-Id-Version: amazon-s3-and-cloudfront 3.2.3\n"
+"Project-Id-Version: amazon-s3-and-cloudfront 3.2.4\n"
 "Report-Msgid-Bugs-To: mailto:nom@deliciousbrains.com\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2023-06-13T14:03:36+00:00\n"
+"POT-Creation-Date: 2023-06-26T08:03:29+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.5.0\n"
+"X-Generator: WP-CLI 2.8.1\n"
 "X-Domain: amazon-s3-and-cloudfront\n"
 
 #. Plugin Name of the plugin
@@ -1131,53 +1131,53 @@ msgstr ""
 msgid "<strong>Warning:</strong> This site is using PHP %1$s, in a future update WP Offload Media will require PHP %2$s or later. %3$s"
 msgstr ""
 
-#: classes/integrations/media-library.php:246
+#: classes/integrations/media-library.php:256
 msgid "Can't create item from media library item %d"
 msgstr ""
 
-#: classes/integrations/media-library.php:531
+#: classes/integrations/media-library.php:541
 msgid "Offload"
 msgstr ""
 
-#: classes/integrations/media-library.php:958
+#: classes/integrations/media-library.php:968
 msgid "No"
 msgstr ""
 
-#: classes/integrations/media-library.php:968
+#: classes/integrations/media-library.php:978
 msgctxt "Storage provider key name"
 msgid "Storage Provider"
 msgstr ""
 
-#: classes/integrations/media-library.php:969
+#: classes/integrations/media-library.php:979
 msgctxt "Storage provider name"
 msgid "Storage Provider"
 msgstr ""
 
-#: classes/integrations/media-library.php:970
+#: classes/integrations/media-library.php:980
 msgctxt "Bucket name"
 msgid "Bucket"
 msgstr ""
 
-#: classes/integrations/media-library.php:971
+#: classes/integrations/media-library.php:981
 msgctxt "Path to file in bucket"
 msgid "Path"
 msgstr ""
 
-#: classes/integrations/media-library.php:972
+#: classes/integrations/media-library.php:982
 msgctxt "Location of bucket"
 msgid "Region"
 msgstr ""
 
-#: classes/integrations/media-library.php:973
+#: classes/integrations/media-library.php:983
 msgctxt "Access control list of the file in bucket"
 msgid "Access"
 msgstr ""
 
-#: classes/integrations/media-library.php:974
+#: classes/integrations/media-library.php:984
 msgid "URL"
 msgstr ""
 
-#: classes/integrations/media-library.php:975
+#: classes/integrations/media-library.php:985
 msgctxt "Whether or not metadata has been verified"
 msgid "Verified"
 msgstr ""

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: uploads, amazon, s3, amazon s3, digitalocean, digitalocean spaces, google
 Requires at least: 5.5
 Tested up to: 6.2
 Requires PHP: 7.2
-Stable tag: 3.2.3
+Stable tag: 3.2.4
 License: GPLv3
 
 Copies files to Amazon S3, DigitalOcean Spaces or Google Cloud Storage as they are uploaded to the Media Library. Optionally configure Amazon CloudFront or another CDN for faster delivery.
@@ -85,6 +85,9 @@ This version requires PHP 5.3.3+ and the Amazon Web Services plugin
 
 == Changelog ==
 
+= WP Offload Media Lite 3.2.4 - 2023-06-26 =
+* Bug fix: Newly added rotated images no longer fail to automatically offload
+
 = WP Offload Media Lite 3.2.3 - 2023-06-13 =
 * Bug fix: Broken legacy amazonS3_info metadata no longer causes upgrade routines to fail
 

diff --git a/wordpress-s3.php b/wordpress-s3.php
@@ -4,7 +4,7 @@
 Plugin URI: http://wordpress.org/extend/plugins/amazon-s3-and-cloudfront/
 Description: Automatically copies media uploads to Amazon S3, DigitalOcean Spaces or Google Cloud Storage for storage and delivery. Optionally configure Amazon CloudFront or another CDN for even faster delivery.
 Author: Delicious Brains
-Version: 3.2.3
+Version: 3.2.4
 Author URI: https://deliciousbrains.com/?utm_campaign=WP%2BOffload%2BS3&utm_source=wordpress.org&utm_medium=free%2Bplugin%2Blisting
 Network: True
 Text Domain: amazon-s3-and-cloudfront
@@ -28,7 +28,7 @@
 
 // phpcs:disable SlevomatCodingStandard.Variables.UnusedVariable
 
-$GLOBALS['aws_meta']['amazon-s3-and-cloudfront']['version'] = '3.2.3';
+$GLOBALS['aws_meta']['amazon-s3-and-cloudfront']['version'] = '3.2.4';
 
 require_once dirname( __FILE__ ) . '/classes/as3cf-compatibility-check.php';