From 1ddbb10e1ca42e26dec4d62529350df434131940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radovan=20=C5=A0mitala?= Date: Tue, 10 Oct 2023 13:28:01 +0200 Subject: [PATCH 1/8] Align PHP minimum version checks --- windows-azure-storage.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/windows-azure-storage.php b/windows-azure-storage.php index 0e065c37..d100b57e 100644 --- a/windows-azure-storage.php +++ b/windows-azure-storage.php @@ -70,7 +70,7 @@ * @return string Minimum version required. */ function was_minimum_php_requirement() { - return '7.4'; + return '8.0'; } /** @@ -214,11 +214,9 @@ function windows_azure_storage_load_textdomain() { */ function windows_azure_plugin_check_prerequisite() { global $wp_version; - $php_version = phpversion(); - $php_compat = version_compare( $php_version, '8.0.0', '>=' ); - if ( ! $php_compat ) { + if ( ! was_minimum_php_requirement() ) { deactivate_plugins( plugin_basename( __FILE__ ) ); - wp_die( __( 'Microsoft Azure Storage for WordPress requires at least PHP 8.0.0', 'windows-azure-storage' ) ); + wp_die( __( 'Microsoft Azure Storage for WordPress requires at least PHP ' . was_minimum_php_requirement(), 'windows-azure-storage' ) ); } $wp_compat = version_compare( $wp_version, '5.7', '>=' ); if ( ! $wp_compat ) { From a56e3c23dd619816e75fcb8424f0baf513114110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radovan=20=C5=A0mitala?= Date: Mon, 16 Oct 2023 14:14:36 +0200 Subject: [PATCH 2/8] Update windows-azure-storage.php --- windows-azure-storage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows-azure-storage.php b/windows-azure-storage.php index d100b57e..a475e0d5 100644 --- a/windows-azure-storage.php +++ b/windows-azure-storage.php @@ -214,7 +214,7 @@ function windows_azure_storage_load_textdomain() { */ function windows_azure_plugin_check_prerequisite() { global $wp_version; - if ( ! was_minimum_php_requirement() ) { + if ( ! was_site_meets_php_requirements() ) { deactivate_plugins( plugin_basename( __FILE__ ) ); wp_die( __( 'Microsoft Azure Storage for WordPress requires at least PHP ' . was_minimum_php_requirement(), 'windows-azure-storage' ) ); } From 04b2840f7f64c7c5435003ca2f1b2ea0cefee6be Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Fri, 27 Oct 2023 15:14:33 -0500 Subject: [PATCH 3/8] Bump WordPress "tested up to" version 6.4 Co-authored-by: Harshal Kadu --- readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index 924848e0..0ec06524 100644 --- a/readme.txt +++ b/readme.txt @@ -2,7 +2,7 @@ Contributors: msopentech, 10up, morganestes, stevegrunwell, lpawlik, ritteshpatel, johnwatkins0, rickalee, eflorea, phyrax, ravichandra, jeffpaul Tags: Microsoft, Microsoft Open Technologies, Microsoft Azure, Microsoft Azure Storage, Media Files, Upload, CDN, blob storage Requires at least: 5.7 -Tested up to: 6.3 +Tested up to: 6.4 Requires PHP: 7.4 Stable tag: 4.4.0 License: BSD 2-Clause From cf4a699a1f4f8dba45934461a72ee7dcf7c9b9ce Mon Sep 17 00:00:00 2001 From: Hugo Solar Date: Mon, 11 Dec 2023 09:55:58 -0300 Subject: [PATCH 4/8] remove urlencode from srcset calculation function --- windows-azure-storage.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows-azure-storage.php b/windows-azure-storage.php index f3fe32d3..bc52c1cb 100644 --- a/windows-azure-storage.php +++ b/windows-azure-storage.php @@ -879,11 +879,11 @@ function windows_azure_storage_wp_calculate_image_srcset( $sources, $size_array, $img_filename = substr( $source['url'], strrpos( $source['url'], '/' ) + 1 ); if ( basename( $media_info['blob'] ) === $img_filename ) { - $source['url'] = esc_url( $base_url . urlencode( $media_info['blob'] ), $esc_url_protocols ); + $source['url'] = esc_url( $base_url . $media_info['blob'], $esc_url_protocols ); } else { foreach ( $media_info['thumbnails'] as $thumbnail ) { if ( basename( $thumbnail ) === $img_filename ) { - $source['url'] = esc_url( $base_url . urlencode( $thumbnail ), $esc_url_protocols ); + $source['url'] = esc_url( $base_url . $thumbnail, $esc_url_protocols ); break; } } From da2187e15d6a55058ffe820f4e4dfec9a9c1f541 Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Thu, 4 Jan 2024 12:45:01 -0600 Subject: [PATCH 5/8] Update CODEOWNERS --- .github/CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f053016d..733a47ea 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,5 +1,5 @@ -# These owners will be the default owners for everything in the repo. Unless a later match takes precedence, @10up/open-source-practice or @rickalee, as primary maintainers will be requested for review when someone opens a Pull Request. -* @10up/open-source-practice @rickalee +# These owners will be the default owners for everything in the repo. Unless a later match takes precedence, @jeffpaul, @dkotter, or @rickalee, as primary maintainers will be requested for review when someone opens a Pull Request. +* @jeffpaul @dkotter @rickalee # GitHub and WordPress.org specifics /.github/ @jeffpaul From 7a588ff7dfce9af5549e2ff83054c098f605f189 Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Fri, 5 Jan 2024 13:54:59 -0700 Subject: [PATCH 6/8] Version bump to 4.4.1 --- js/windows-azure-storage-admin.js | 2 +- js/windows-azure-storage-media-browser.js | 2 +- package-lock.json | 4 ++-- package.json | 2 +- readme.txt | 2 +- windows-azure-storage.php | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/js/windows-azure-storage-admin.js b/js/windows-azure-storage-admin.js index 53cf7774..d60fff8b 100644 --- a/js/windows-azure-storage-admin.js +++ b/js/windows-azure-storage-admin.js @@ -1,4 +1,4 @@ -/*! - v4.4.0 +/*! - v4.4.1 * https://github.com/10up/windows-azure-storage#readme * Copyright (c) 2021; */ (function ( $, window, undefined ) { diff --git a/js/windows-azure-storage-media-browser.js b/js/windows-azure-storage-media-browser.js index e829c1ca..87d5079d 100644 --- a/js/windows-azure-storage-media-browser.js +++ b/js/windows-azure-storage-media-browser.js @@ -1,4 +1,4 @@ -/*! - v4.4.0 +/*! - v4.4.1 * https://github.com/10up/windows-azure-storage#readme * Copyright (c) 2021; */ window.wp = window.wp || {}; diff --git a/package-lock.json b/package-lock.json index 7f1a108b..b1ba4706 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "windows-azure-storage", - "version": "4.4.0", + "version": "4.4.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "windows-azure-storage", - "version": "4.4.0", + "version": "4.4.1", "license": "BSD-2-Clause", "dependencies": { "grunt": "^1.5.3", diff --git a/package.json b/package.json index 84de0f4e..18141270 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "windows-azure-storage", - "version": "4.4.0", + "version": "4.4.1", "description": "Use the Microsoft Azure Storage service to host your website's media files.", "homepage": "https://github.com/10up/windows-azure-storage#readme", "bugs": { diff --git a/readme.txt b/readme.txt index 0ec06524..c159e740 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: Microsoft, Microsoft Open Technologies, Microsoft Azure, Micr Requires at least: 5.7 Tested up to: 6.4 Requires PHP: 7.4 -Stable tag: 4.4.0 +Stable tag: 4.4.1 License: BSD 2-Clause License URI: http://www.opensource.org/licenses/bsd-license.php diff --git a/windows-azure-storage.php b/windows-azure-storage.php index ca8978b9..729509e0 100644 --- a/windows-azure-storage.php +++ b/windows-azure-storage.php @@ -3,7 +3,7 @@ * Plugin Name: Microsoft Azure Storage for WordPress * Plugin URI: https://wordpress.org/plugins/windows-azure-storage/ * Description: Use the Microsoft Azure Storage service to host your website's media files. - * Version: 4.4.0 + * Version: 4.4.1 * Requires at least: 5.7 * Requires PHP: 8.0 * Author: 10up, Microsoft Open Technologies @@ -62,7 +62,7 @@ define( 'MSFT_AZURE_PLUGIN_PATH', plugin_dir_path( __FILE__ ) ); define( 'MSFT_AZURE_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); define( 'MSFT_AZURE_PLUGIN_LEGACY_MEDIA_URL', get_admin_url( get_current_blog_id(), 'media-upload.php' ) ); -define( 'MSFT_AZURE_PLUGIN_VERSION', '4.4.0' ); +define( 'MSFT_AZURE_PLUGIN_VERSION', '4.4.1' ); /** * Get the minimum version of PHP required by this plugin. From 758ded9edf0c361c296e647032656c26248049a0 Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Fri, 5 Jan 2024 14:01:18 -0700 Subject: [PATCH 7/8] Update changelog --- CHANGELOG.md | 12 ++++++++++++ readme.txt | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index af19d11e..ed15d860 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file, per [the Ke ## [Unreleased] - TBD +## [4.4.1] - 2024-01-08 +### Added +- Support for the WordPress.org plugin preview (props [@dkotter](https://github.com/dkotter), [@jeffpaul](https://github.com/jeffpaul) via [#212](https://github.com/10up/windows-azure-storage/pull/212)). + +### Changed +- Bump WordPress version "tested up to" 6.4 (props [@QAharshalkadu](https://github.com/QAharshalkadu), [@jeffpaul](https://github.com/jeffpaul) via [#208](https://github.com/10up/windows-azure-storage/pull/208), [#209](https://github.com/10up/windows-azure-storage/pull/209)). +- Align our PHP minimum version checks to use new helper method (props [@radeno](https://github.com/radeno), [@ravinderk](https://github.com/ravinderk) via [#202](https://github.com/10up/windows-azure-storage/pull/202)). + +### Fixed +- Remove urlencode from srcset calculation function (props [@hugosolar](https://github.com/hugosolar), [@rickalee](https://github.com/rickalee), [@Sidsector9](https://github.com/Sidsector9) via [#211](https://github.com/10up/windows-azure-storage/pull/211)). + ## [4.4.0] - 2023-10-17 **Note that this release bumps the minimum PHP version from 7.4 to 8.0** @@ -240,6 +251,7 @@ All notable changes to this project will be documented in this file, per [the Ke - First release of Microsoft Azure Storage plugin for WordPress. [Unreleased]: https://github.com/10up/windows-azure-storage/compare/trunk...develop +[4.4.1]: https://github.com/10up/windows-azure-storage/compare/4.4.0...4.4.1 [4.4.0]: https://github.com/10up/windows-azure-storage/compare/4.3.5...4.4.0 [4.3.5]: https://github.com/10up/windows-azure-storage/compare/4.3.4...4.3.5 [4.3.4]: https://github.com/10up/windows-azure-storage/compare/4.3.3...4.3.4 diff --git a/readme.txt b/readme.txt index c159e740..3d39dd27 100644 --- a/readme.txt +++ b/readme.txt @@ -35,6 +35,12 @@ See Settings->Microsoft Azure for more information. == Changelog == += 4.4.1 - 2024-01-08 = +* **Added:** Support for the WordPress.org plugin preview (props [@dkotter](https://github.com/dkotter), [@jeffpaul](https://github.com/jeffpaul) via [#212](https://github.com/10up/windows-azure-storage/pull/212)). +* **Changed:** Bump WordPress version "tested up to" 6.4 (props [@QAharshalkadu](https://github.com/QAharshalkadu), [@jeffpaul](https://github.com/jeffpaul) via [#208](https://github.com/10up/windows-azure-storage/pull/208), [#209](https://github.com/10up/windows-azure-storage/pull/209)). +* **Changed:** Align our PHP minimum version checks to use new helper method (props [@radeno](https://github.com/radeno), [@ravinderk](https://github.com/ravinderk) via [#202](https://github.com/10up/windows-azure-storage/pull/202)). +* **Fixed:** Remove urlencode from srcset calculation function (props [@hugosolar](https://github.com/hugosolar), [@rickalee](https://github.com/rickalee), [@Sidsector9](https://github.com/Sidsector9) via [#211](https://github.com/10up/windows-azure-storage/pull/211)). + = 4.4.0 - 2023-10-17 = **Note that this release bumps the minimum PHP version from 7.4 to 8.0** From 02ce58f9fefdfc15074db87436ce9ce10dfaefca Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Fri, 5 Jan 2024 14:03:10 -0700 Subject: [PATCH 8/8] Update CREDITS.md --- CREDITS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CREDITS.md b/CREDITS.md index 218991cc..63e680f1 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -12,7 +12,7 @@ The following individuals are responsible for curating the list of issues, respo Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc. -[Microsoft Open Technologies (@msopentech)](https://github.com/msopentech), [10up (@10up)](https://github.com/10up), [Morgan Estes (@morganestes)](https://github.com/morganestes), [Steve Grunwell (@stevegrunwell)](https://github.com/stevegrunwell), [Lukas Pawlik (@lukaspawlik)](https://github.com/lukaspawlik), [Ritesh Patel (@Ritesh-patel)](https://github.com/Ritesh-patel), [Peter Sorensen (@psorensen)](https://github.com/psorensen), [Eugene Manuilov (@eugene-manuilov)](https://github.com/eugene-manuilov), [Allan Collins (@allan23)](https://github.com/allan23), [(@jpaarhuis)](https://github.com/jpaarhuis), [Thorsten Ott (@tott)](https://github.com/tott), [Scott Lee (@scottlee)](https://github.com/scottlee), [Emmanuel Fidelino (@EmmanF)](https://github.com/EmmanF), [Joey Blake (@joeyblake)](https://github.com/joeyblake), [(@mrgregwaugh)](https://github.com/mrgregwaugh), [Elliott Stocks (@elliott-stocks)](https://github.com/elliott-stocks), [Brad Parbs (@bradp)](https://github.com/bradp), [Bibin Kurian (@bibinkurian)](https://github.com/bibinkurian), [Anu Thomas Chandy (@anuchandy)](https://github.com/anuchandy), [Suman Chawla (@suchawla)](https://github.com/suchawla), [(@mksunitha)](https://profiles.wordpress.org/mksunitha/), [Justin Kopepasah (@kopepasah)](https://github.com/kopepasah), [John Watkins (@johnwatkins0)](https://github.com/johnwatkins0), [Eduard Florea (@eflorea)](https://github.com/eflorea), [Jay Wood (@jaywood)](https://github.com/jaywood), [Ravi Chandra (@ravichdev)](https://github.com/ravichdev), [Ricky Lee Whittemore (@rickalee)](https://github.com/rickalee), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Oscar Sanchez S. (@oscarssanchez)](https://github.com/oscarssanchez), [Ricardo Moraleida (@moraleida)](https://github.com/moraleida), [Kentaro Ohkouchi (@nanasess)](https://github.com/nanasess), [David Greenwald (@davidegreenwald)](https://github.com/davidegreenwald), [Shah Qureshi (@ShahAaron)](https://github.com/ShahAaron), [(@lostfields)](https://github.com/lostfields), [Matthew McAchran (@mmcachran)](https://github.com/mmcachran), [Jake Edwards (@ShadowXVII)](https://github.com/ShadowXVII), [Cole Geissinger (@colegeissinger)](https://github.com/colegeissinger), [(@cally423)](https://github.com/cally423), [(@FreuxF)](https://github.com/FreuxF), [Eric Greenfield (@saltnpixels)](https://github.com/saltnpixels), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Max Lyuchin (@cadic)](https://github.com/cadic), [Marius L. Jensen (@Clorith)](https://github.com/Clorith), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Debabrata Karfa (@debabratakarfa)](https://github.com/debabratakarfa), [Sudip Dadhaniya (@sudip-10up)](https://github.com/sudip-10up), [Curtis Loisel (@csloisel)](https://github.com/csloisel), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Jayedul Kabir (@jayedul)](https://github.com/jayedul), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Andrew Herder (@superpowered)](https://github.com/superpowered), [Giovanbattista Amato (@gioamato)](https://github.com/gioamato), [Barney Jeffries (@barneyjeffries)](https://github.com/barneyjeffries), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Ben Marshall (@bmarshall511)](https://github.com/bmarshall511), [Thrijith Thankachan (@thrijith)](https://github.com/thrijith), [Harshal Kadu (@QAharshalkadu)](https://github.com/QAharshalkadu). +[Microsoft Open Technologies (@msopentech)](https://github.com/msopentech), [10up (@10up)](https://github.com/10up), [Morgan Estes (@morganestes)](https://github.com/morganestes), [Steve Grunwell (@stevegrunwell)](https://github.com/stevegrunwell), [Lukas Pawlik (@lukaspawlik)](https://github.com/lukaspawlik), [Ritesh Patel (@Ritesh-patel)](https://github.com/Ritesh-patel), [Peter Sorensen (@psorensen)](https://github.com/psorensen), [Eugene Manuilov (@eugene-manuilov)](https://github.com/eugene-manuilov), [Allan Collins (@allan23)](https://github.com/allan23), [(@jpaarhuis)](https://github.com/jpaarhuis), [Thorsten Ott (@tott)](https://github.com/tott), [Scott Lee (@scottlee)](https://github.com/scottlee), [Emmanuel Fidelino (@EmmanF)](https://github.com/EmmanF), [Joey Blake (@joeyblake)](https://github.com/joeyblake), [(@mrgregwaugh)](https://github.com/mrgregwaugh), [Elliott Stocks (@elliott-stocks)](https://github.com/elliott-stocks), [Brad Parbs (@bradp)](https://github.com/bradp), [Bibin Kurian (@bibinkurian)](https://github.com/bibinkurian), [Anu Thomas Chandy (@anuchandy)](https://github.com/anuchandy), [Suman Chawla (@suchawla)](https://github.com/suchawla), [(@mksunitha)](https://profiles.wordpress.org/mksunitha/), [Justin Kopepasah (@kopepasah)](https://github.com/kopepasah), [John Watkins (@johnwatkins0)](https://github.com/johnwatkins0), [Eduard Florea (@eflorea)](https://github.com/eflorea), [Jay Wood (@jaywood)](https://github.com/jaywood), [Ravi Chandra (@ravichdev)](https://github.com/ravichdev), [Ricky Lee Whittemore (@rickalee)](https://github.com/rickalee), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Oscar Sanchez S. (@oscarssanchez)](https://github.com/oscarssanchez), [Ricardo Moraleida (@moraleida)](https://github.com/moraleida), [Kentaro Ohkouchi (@nanasess)](https://github.com/nanasess), [David Greenwald (@davidegreenwald)](https://github.com/davidegreenwald), [Shah Qureshi (@ShahAaron)](https://github.com/ShahAaron), [(@lostfields)](https://github.com/lostfields), [Matthew McAchran (@mmcachran)](https://github.com/mmcachran), [Jake Edwards (@ShadowXVII)](https://github.com/ShadowXVII), [Cole Geissinger (@colegeissinger)](https://github.com/colegeissinger), [(@cally423)](https://github.com/cally423), [(@FreuxF)](https://github.com/FreuxF), [Eric Greenfield (@saltnpixels)](https://github.com/saltnpixels), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Max Lyuchin (@cadic)](https://github.com/cadic), [Marius L. Jensen (@Clorith)](https://github.com/Clorith), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Debabrata Karfa (@debabratakarfa)](https://github.com/debabratakarfa), [Sudip Dadhaniya (@sudip-10up)](https://github.com/sudip-10up), [Curtis Loisel (@csloisel)](https://github.com/csloisel), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Jayedul Kabir (@jayedul)](https://github.com/jayedul), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Andrew Herder (@superpowered)](https://github.com/superpowered), [Giovanbattista Amato (@gioamato)](https://github.com/gioamato), [Barney Jeffries (@barneyjeffries)](https://github.com/barneyjeffries), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Ben Marshall (@bmarshall511)](https://github.com/bmarshall511), [Thrijith Thankachan (@thrijith)](https://github.com/thrijith), [Harshal Kadu (@QAharshalkadu)](https://github.com/QAharshalkadu), [Radovan Šmitala (@radeno)](https://github.com/radeno), [Ravinder Kumar (@ravinderk)](https://github.com/ravinderk), [Hugo Solar (@hugosolar)](https://github.com/hugosolar). ## Libraries