From 95a3183ec18eca1ca866e7397693fbfe62a0b895 Mon Sep 17 00:00:00 2001 From: "Ian M. Jones" Date: Wed, 5 Oct 2022 15:28:12 +0100 Subject: [PATCH] Deploying version 3.0.2 --- assets/css/attachment.css | 8 ++------ assets/css/attachment.min.css | 2 +- assets/sass/attachment.scss | 10 +++------- classes/integrations/advanced-custom-fields.php | 10 +++++++++- languages/amazon-s3-and-cloudfront-en.pot | 2 +- readme.txt | 6 +++++- wordpress-s3.php | 4 ++-- 7 files changed, 23 insertions(+), 19 deletions(-) diff --git a/assets/css/attachment.css b/assets/css/attachment.css index 5fca3eb7..c0e344d8 100644 --- a/assets/css/attachment.css +++ b/assets/css/attachment.css @@ -13,22 +13,18 @@ #s3-actions.postbox .s3-details .misc-pub-section { clear: both; - float: left; - width: 100%; -webkit-box-sizing: border-box; box-sizing: border-box; } #s3-actions.postbox .s3-details .misc-pub-section .s3-key { - float: left; - width: 20%; + display: inline-block; white-space: nowrap; } #s3-actions.postbox .s3-details .misc-pub-section .s3-value { + display: inline-block; font-weight: bold; - float: left; - width: 80%; } #s3-actions.postbox .s3-details .misc-pub-section .s3-value .more-info { diff --git a/assets/css/attachment.min.css b/assets/css/attachment.min.css index f935b5d2..0699278b 100644 --- a/assets/css/attachment.min.css +++ b/assets/css/attachment.min.css @@ -1 +1 @@ -#s3-actions.postbox .inside{margin:0;padding:0}#s3-actions.postbox a,#s3-actions.postbox a:hover{text-decoration:none}#s3-actions.postbox .s3-details{padding:6px 0}#s3-actions.postbox .s3-details .misc-pub-section{clear:both;float:left;width:100%;-webkit-box-sizing:border-box;box-sizing:border-box}#s3-actions.postbox .s3-details .misc-pub-section .s3-key{float:left;width:20%;white-space:nowrap}#s3-actions.postbox .s3-details .misc-pub-section .s3-value{font-weight:700;float:left;width:80%}#s3-actions.postbox .s3-details .misc-pub-section .s3-value .more-info{font-weight:lighter}#s3-actions.postbox .s3-details .misc-pub-section input.error{color:#a00}#s3-actions.postbox .s3-details .not-copied{color:#666}#s3-actions.postbox .s3-actions{padding:10px;clear:both;border-top:1px solid #ddd;border-bottom:1px solid #ddd;background:#f5f5f5}#s3-actions.postbox .s3-actions .copy-action{text-align:right;float:right;line-height:23px}#s3-actions.postbox .s3-actions .remove-action{line-height:28px;vertical-align:middle;text-align:left;float:left}#s3-actions.postbox .s3-actions .remove-action a.local-warning{color:#a00}#s3-actions.postbox .s3-actions .remove-action a.local-warning:hover{color:red} \ No newline at end of file +#s3-actions.postbox .inside{margin:0;padding:0}#s3-actions.postbox a,#s3-actions.postbox a:hover{text-decoration:none}#s3-actions.postbox .s3-details{padding:6px 0}#s3-actions.postbox .s3-details .misc-pub-section{clear:both;-webkit-box-sizing:border-box;box-sizing:border-box}#s3-actions.postbox .s3-details .misc-pub-section .s3-key{display:inline-block;white-space:nowrap}#s3-actions.postbox .s3-details .misc-pub-section .s3-value{display:inline-block;font-weight:700}#s3-actions.postbox .s3-details .misc-pub-section .s3-value .more-info{font-weight:lighter}#s3-actions.postbox .s3-details .misc-pub-section input.error{color:#a00}#s3-actions.postbox .s3-details .not-copied{color:#666}#s3-actions.postbox .s3-actions{padding:10px;clear:both;border-top:1px solid #ddd;border-bottom:1px solid #ddd;background:#f5f5f5}#s3-actions.postbox .s3-actions .copy-action{text-align:right;float:right;line-height:23px}#s3-actions.postbox .s3-actions .remove-action{line-height:28px;vertical-align:middle;text-align:left;float:left}#s3-actions.postbox .s3-actions .remove-action a.local-warning{color:#a00}#s3-actions.postbox .s3-actions .remove-action a.local-warning:hover{color:red} \ No newline at end of file diff --git a/assets/sass/attachment.scss b/assets/sass/attachment.scss index fd3be86b..253b1f6b 100644 --- a/assets/sass/attachment.scss +++ b/assets/sass/attachment.scss @@ -13,22 +13,18 @@ .misc-pub-section { clear: both; - float: left; - width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; .s3-key { - float: left; - width: 20%; + display: inline-block; white-space: nowrap; } .s3-value { + display: inline-block; font-weight: bold; - float: left; - width: 80%; .more-info { font-weight: lighter; @@ -73,4 +69,4 @@ } } } -} \ No newline at end of file +} diff --git a/classes/integrations/advanced-custom-fields.php b/classes/integrations/advanced-custom-fields.php index 30610d63..8bb8b94f 100644 --- a/classes/integrations/advanced-custom-fields.php +++ b/classes/integrations/advanced-custom-fields.php @@ -2,8 +2,10 @@ namespace DeliciousBrains\WP_Offload_Media\Integrations; +use AS3CF_Error; use DeliciousBrains\WP_Offload_Media\Items\Media_Library_Item; use DeliciousBrains\WP_Offload_Media\Items\Remove_Local_Handler; +use Exception; use WP_Error; class Advanced_Custom_Fields extends Integration { @@ -176,7 +178,13 @@ public function maybe_remove_original_after_download() { * @return array */ public function acf_load_config( array $config ): array { - $filtered_config = unserialize( $this->as3cf->filter_local->filter_post( serialize( $config ) ) ); + try { + $filtered_config = unserialize( $this->as3cf->filter_local->filter_post( serialize( $config ) ) ); + } catch ( Exception $e ) { + AS3CF_Error::log( __METHOD__ . ' ' . $e->getMessage() ); + + return $config; + } return is_array( $filtered_config ) ? $filtered_config : $config; } diff --git a/languages/amazon-s3-and-cloudfront-en.pot b/languages/amazon-s3-and-cloudfront-en.pot index 6221cd7d..d32f9b34 100644 --- a/languages/amazon-s3-and-cloudfront-en.pot +++ b/languages/amazon-s3-and-cloudfront-en.pot @@ -6,7 +6,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2022-09-29 16:30+0000\n" +"POT-Creation-Date: 2022-10-05 13:58+0000\n" "Report-Msgid-Bugs-To: mailto:nom@deliciousbrains.com\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: __;_e;_ex:1,2c;_n:1,2;_n_noop:1,2;_nx:1,2,4c;_nx_noop:1,2,3c;_x:1,2c;esc_attr__;esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c\n" diff --git a/readme.txt b/readme.txt index fa35e591..7bd54dee 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: uploads, amazon, s3, amazon s3, digitalocean, digitalocean spaces, google Requires at least: 5.3 Tested up to: 6.1 Requires PHP: 7.2 -Stable tag: 3.0.0 +Stable tag: 3.0.2 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,10 @@ This version requires PHP 5.3.3+ and the Amazon Web Services plugin == Changelog == += WP Offload Media Lite 3.0.2 - 2022-10-05 = +* Bug fix: ACF integration no longer breaks sites using closures in ACF field config (edge case) +* Bug fix: The Offload metabox for attachments no longer has issues for some browser and screen resolution combinations + = WP Offload Media Lite 3.0.0 - 2022-09-29 = * [Release Summary Blog Post](https://deliciousbrains.com/wp-offload-media-3-0-released/?utm_campaign=changelogs&utm_source=wordpress.org&utm_medium=free%2Bplugin%2Blisting) * New: Fresh new settings page UI! 🎉 diff --git a/wordpress-s3.php b/wordpress-s3.php index 17999dbf..3c2c2ac5 100644 --- 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.0.0 +Version: 3.0.2 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.0.0'; +$GLOBALS['aws_meta']['amazon-s3-and-cloudfront']['version'] = '3.0.2'; require_once dirname( __FILE__ ) . '/classes/as3cf-compatibility-check.php';