Merge branch 'develop' into trunk

.distignore

@@ -12,11 +12,11 @@
 .gitignore
 CHANGELOG.md
 CODE_OF_CONDUCT.md
+composer.json
 CONTRIBUTING.md
 CREDITS.md
 Gruntfile.js
 LICENSE
-README.md
-composer.json
 package-lock.json
 package.json
+README.md

.github/workflows/push-asset-readme-update.yml

@@ -2,15 +2,15 @@ name: Plugin asset/readme update
 on:
   push:
     branches:
-    - master
+    - trunk
 jobs:
-  master:
-    name: Push to master
+  trunk:
+    name: Push to trunk
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
     - name: WordPress.org plugin asset/readme update
-      uses: 10up/action-wordpress-plugin-asset-update@master
+      uses: 10up/action-wordpress-plugin-asset-update@stable
       env:
         SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
         SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

.github/workflows/push-deploy.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: WordPress Plugin Deploy
-      uses: 10up/action-wordpress-plugin-deploy@develop
+      uses: 10up/action-wordpress-plugin-deploy@stable
       env:
         SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
         SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

CHANGELOG.md

@@ -4,11 +4,23 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased] - TBD
 
+## [4.3.2] - 2021-03-03
+### Changed
+- Bump WordPress version "tested up to" 5.6 (props [@davidegreenwald](https://github.com/davidegreenwald), [@ShahAaron](https://github.com/ShahAaron), [@lostfields](https://github.com/lostfields)).
+
+### Fixed
+- Image sizes when uploading to a post that is not in current month (props [@eflorea](https://github.com/eflorea), [@mmcachran](https://github.com/mmcachran), [@ShadowXVII](https://github.com/ShadowXVII) via [#118](https://github.com/10up/windows-azure-storage/pull/118)).
+- Upload date in image metadata on back date posts (props [@colegeissinger](https://github.com/colegeissinger), [@rickalee](https://github.com/rickalee), [@cally423](https://github.com/cally423), [@FreuxF](https://github.com/FreuxF) via [#131](https://github.com/10up/windows-azure-storage/pull/131)).
+
+### Security
+- Bump `websocket-extensions` from 0.1.3 to 0.1.4 (props [@dependabot](https://github.com/apps/dependabot) via [#123](https://github.com/10up/windows-azure-storage/pull/123)).
+- Bump `lodash` from 4.17.15 to 4.17.19 (props [@dependabot](https://github.com/apps/dependabot) via [#124](https://github.com/10up/windows-azure-storage/pull/124)).
+
 ## [4.3.1] - 2020-02-12
 ### Fixed
 - Restore visual indicator of upload progress to Azure Blob Storage and account for `original_image` in count (props [@rickalee](https://github.com/rickalee), [@moraleida](https://github.com/moraleida) via [#110](https://github.com/10up/windows-azure-storage/pull/110), [#109](https://github.com/10up/windows-azure-storage/pull/109)).
-- Ensure PDF thumbnails are offloaded with JPEG mimetype instead of PDF
-- Normalize file paths on Windows Server
+- Ensure PDF thumbnails are offloaded with JPEG mimetype instead of PDF (props [@rickalee](https://github.com/rickalee) via [#110](https://github.com/10up/windows-azure-storage/pull/110))
+- Normalize file paths on Windows Server (props [@nanasess](https://github.com/nanasess) via [#108](https://github.com/10up/windows-azure-storage/pull/108))
 
 ## [4.3.0] - 2019-11-18
 ### Added
@@ -138,6 +150,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 - Support to upload video files to blob storage.
 
 ## [1.6.0] - 2012-01-05
+- Added support to upload video files to blob storage.
 
 ## [1.5.0] - 2012-01-04
 ### Added
@@ -168,7 +181,8 @@ All notable changes to this project will be documented in this file, per [the Ke
 ## [1.0.0] - 2010-05-20
 - First release of Microsoft Azure Storage plugin for WordPress.
 
-[Unreleased]: https://github.com/10up/windows-azure-storage/compare/4.3.0...master
+[Unreleased]: https://github.com/10up/windows-azure-storage/compare/trunk...develop
+[4.3.2]: https://github.com/10up/windows-azure-storage/compare/4.3.1...4.3.2
 [4.3.1]: https://github.com/10up/windows-azure-storage/compare/4.3.0...4.3.1
 [4.3.0]: https://github.com/10up/windows-azure-storage/compare/013bb82...4.3.0
 [4.2.0]: https://github.com/10up/windows-azure-storage/compare/69fb174...013bb82

CONTRIBUTING.md

@@ -24,20 +24,20 @@ For more on how 10up writes and manages code, check out our [10up Engineering Be
 
 ## Workflow
 
-The `develop` branch is the development branch which means it contains the next version to be released.  `stable` contains the current latest release and `master` contains the corresponding stable development version.  Always work on the `develop` branch and open up PRs against `develop`.
+The `develop` branch is the development branch which means it contains the next version to be released.  `stable` contains the current latest release and `trunk` contains the corresponding stable development version.  Always work on the `develop` branch and open up PRs against `develop`.
 
 ## Release instructions
 
 1. Branch: Starting from `develop`, cut a release branch named `release/X.Y.Z` for your changes.
-2. Version bump: Bump the version number in `composer.json`, `js/windows-azure-storage-admin.js`, `js/windows-azure-storage-media-browser.js`, `package.json`, `readme.txt`, and `windows-azure-storage.php` if it does not already reflect the version being released.
-3. Changelog: Add/update the changelog in both `readme.txt` and `CHANGELOG.md`.
-4. Props: Update `CREDITS.md` file with any new contributors, confirm maintainers are accurate.
-5. New files: Check to be sure any new files/paths that are unnecessary in the production version are included in `.distignore`.
-6. Readme updates: Make any other readme changes as necessary.  `CHANGELOG.md` and `README.md` are geared toward GitHub and `readme.txt` contains WordPress.org-specific content.  The two are slightly different.
-7. Merge: Make a non-fast-forward merge from your release branch to `develop` (or merge the pull request), then do the same for `develop` into `master` (`git checkout master && git merge --no-ff develop`).  `master` contains the stable development version.
-8. Push: Push your master branch to GitHub, e.g. `git push origin master`.
-9. Release: Create a [new release](https://github.com/10up/windows-azure-storage/releases/new), naming the tag and the release with the new version number, and targeting the `master` branch. Paste the changelog from `CHANGELOG.md` into the body of the release and include a link to the closed issues on the milestone (e.g. `https://github.com/10up/windows-azure-storage/milestone/2?closed=1`).
-10. SVN: Wait for the [GitHub Action](https://github.com/10up/windows-azure-storage/actions) to finish deploying to the WordPress.org repository.  If all goes well, users with SVN commit access for that plugin will receive an emailed diff of changes.
-11. Check WordPress.org: Ensure that the changes are live on [https://wordpress.org/plugins/windows-azure-storage/](https://wordpress.org/plugins/windows-azure-storage/). This may take a few minutes.
-12. Close milestone: Edit the [X.Y.Z milestone](https://github.com/10up/windows-azure-storage/milestone/#) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description` field), then close the milestone.
-13. Punt incomplete items: If any open issues or PRs which were milestoned for `X.Y.Z` do not make it into the release, update their milestone to `X.Y.Z+1`, `X.Y+1.0`, `X+1.0.0` or `Future Release`.
+1. Version bump: Bump the version number in `js/windows-azure-storage-admin.js`, `js/windows-azure-storage-media-browser.js`, `package.json`, `readme.txt`, and `windows-azure-storage.php` if it does not already reflect the version being released.  Update both the plugin "Version:" property and the plugin `MSFT_AZURE_PLUGIN_VERSION` constant in `windows-azure-storage.php`.
+1. Changelog: Add/update the changelog in both `readme.txt` and `CHANGELOG.md`.
+1. Props: Update `CREDITS.md` file with any new contributors, confirm maintainers are accurate.
+1. New files: Check to be sure any new files/paths that are unnecessary in the production version are included in `.distignore`.
+1. Readme updates: Make any other readme changes as necessary.  `README.md` is geared toward GitHub and `readme.txt` contains WordPress.org-specific content.  The two are slightly different.
+1. Merge: Make a non-fast-forward merge from your release branch to `develop` (or merge the pull request), then do the same for `develop` into `trunk` (`git checkout trunk && git merge --no-ff develop`).  `trunk` contains the stable development version.
+1. Push: Push your trunk branch to GitHub, e.g. `git push origin trunk`.
+1. Release: Create a [new release](https://github.com/10up/windows-azure-storage/releases/new), naming the tag and the release with the new version number, and targeting the `trunk` branch.  Paste the changelog from `CHANGELOG.md` into the body of the release and include a link to the closed issues on the milestone (e.g. `https://github.com/10up/windows-azure-storage/milestone/#?closed=1`).
+1. SVN: Wait for the [GitHub Action](https://github.com/10up/windows-azure-storage/actions) to finish deploying to the WordPress.org repository.  If all goes well, users with SVN commit access for that plugin will receive an emailed diff of changes.
+1. Check WordPress.org: Ensure that the changes are live on [https://wordpress.org/plugins/windows-azure-storage/](https://wordpress.org/plugins/windows-azure-storage/). This may take a few minutes.
+1. Close milestone: Edit the [milestone](https://github.com/10up/windows-azure-storage/milestone/#) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description` field), then close the milestone.
+1. Punt incomplete items: If any open issues or PRs which were milestoned for `X.Y.Z` do not make it into the release, update their milestone to `X.Y.Z+1`, `X.Y+1.0`, `X+1.0.0` or `Future Release`.

CREDITS.md

@@ -1,3 +1,5 @@
+# Credits
+
 The following acknowledges the Maintainers for this repository, those who have Contributed to this repository (via bug reports, code, design, ideas, project management, translation, testing, etc.), and any Libraries utilized.
 
 ## Maintainers
@@ -10,10 +12,14 @@ 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), [@bibinkurian](https://github.com/bibinkurian), [Anu Thomas Chandy (@anuchandy)](https://github.com/anuchandy), [Suman Chawla (@suchawla)](https://github.com/suchawla), [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).
+[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).
+
+### Security
+- Bump `websocket-extensions` from 0.1.3 to 0.1.4 (props [@dependabot](https://github.com/apps/dependabot) via [#123](https://github.com/10up/windows-azure-storage/pull/123)).
+- Bump `lodash` from 4.17.15 to 4.17.19 (props [@dependabot](https://github.com/apps/dependabot) via [#124](https://github.com/10up/windows-azure-storage/pull/124)).
 
 ## Libraries
 
 The following software libraries are utilized in this repository.
 
-N/A.
+[Microsoft Azure SDK for PHP](https://github.com/Azure/azure-sdk-for-php) by [Microsoft Azure](https://github.com/Azure) and licensed [Apache-2.0](https://github.com/Azure/azure-sdk-for-php/blob/master/LICENSE.txt).

README.md

@@ -2,13 +2,11 @@
 
 > Use the Microsoft Azure Storage service to host your website's media files.
 
-[![Support Level](https://img.shields.io/badge/support-stable-blue.svg)](#support-level) [![Release Version](https://img.shields.io/github/release/10up/windows-azure-storage.svg)](https://github.com/10up/windows-azure-storage/releases/latest) ![WordPress tested up to version](https://img.shields.io/badge/WordPress-v5.3%20tested-success.svg) [![BSD 2-Clause License](https://img.shields.io/github/license/10up/windows-azure-storage.svg)](https://github.com/10up/windows-azure-storage/blob/master/LICENSE)
+[![Support Level](https://img.shields.io/badge/support-stable-blue.svg)](#support-level) [![Release Version](https://img.shields.io/github/release/10up/windows-azure-storage.svg)](https://github.com/10up/windows-azure-storage/releases/latest) ![WordPress tested up to version](https://img.shields.io/badge/WordPress-v5.6%20tested-success.svg) [![BSD 2-Clause License](https://img.shields.io/github/license/10up/windows-azure-storage.svg)](https://github.com/10up/windows-azure-storage/blob/trunk/LICENSE)
 
 ## Description
 
-This WordPress plugin allows you to use Microsoft Azure Storage Service to host
-your media and uploads for your WordPress powered website. Microsoft Azure Storage is an effective way
-to infinitely scale storage of your site and leverage Azure's global infrastructure.
+This WordPress plugin allows you to use Microsoft Azure Storage Service to host your media and uploads for your WordPress powered website. Microsoft Azure Storage is an effective way to infinitely scale storage of your site and leverage Azure's global infrastructure.
 
 For more details on Microsoft Azure Storage, please visit the <a href="https://azure.microsoft.com/en-us/services/storage/">Microsoft Azure website</a>.
 
@@ -33,7 +31,6 @@ For multisites or to enforce Azure Blob Storage settings, you can define the fol
 
 See Settings->Microsoft Azure for more information.
 
-
 ## Upgrade Notice
 
 ### 3.0.0
@@ -61,9 +58,8 @@ A complete listing of all notable changes to Microsoft Azure Storage are documen
 
 Please read [CODE_OF_CONDUCT.md](https://github.com/10up/windows-azure-storage/blob/develop/CODE_OF_CONDUCT.md) for details on our code of conduct, [CONTRIBUTING.md](https://github.com/10up/windows-azure-storage/blob/develop/CONTRIBUTING.md) for details on the process for submitting pull requests to us, and [CREDITS.md](https://github.com/10up/windows-azure-storage/blob/develop/CREDITS.md) for a listing of maintainers of, contributors to, and libraries used by Microsoft Azure Storage.
 
-
 ## Like what you see?
 
 <p align="center">
-<a href="http://10up.com/contact/"><img src="https://10updotcom-wpengine.s3.amazonaws.com/uploads/2016/10/10up-Github-Banner.png" width="850"></a>
+<a href="http://10up.com/contact/"><img src="https://10up.com/uploads/2016/10/10up-Github-Banner.png" width="850"></a>
 </p>

composer.json

@@ -1,15 +1,15 @@
 {
   "name": "10up/windows-azure-storage",
   "description": "Use the Microsoft Azure Storage service to host your website's media files.",
-  "version": "4.3.1",
   "type": "wordpress-plugin",
   "keywords": [],
-  "homepage": "https://10up.com",
-  "license": "GPL-2.0+",
+  "homepage": "https://github.com/10up/windows-azure-storage",
+  "license": "BSD-2-Clause",
   "authors": [
     {
       "name": "10up",
-      "email": "[email protected]",
+      "email": "[email protected]",
+      "homepage": "https://10up.com",
       "role": "Developer"
     }
   ],

includes/class-windows-azure-helper.php

@@ -598,13 +598,16 @@ static public function file_exists( $relative_path ) {
 	 *
 	 * @static
 	 * @access public
+	 *
+	 * @param string $time Optional. Time formatted in 'yyyy/mm'. Default null.
+	 *
 	 * @return array
 	 */
-	static public function wp_upload_dir() {
+	static public function wp_upload_dir( $time = null ) {
 		static $wp_upload_dir = array();
 
 		$blog_id = get_current_blog_id();
-		if ( empty( $wp_upload_dir[ $blog_id ] ) ) {
+		if ( empty( $wp_upload_dir[ $blog_id ] ) || ! is_null( $time ) ) {
 			$dir = $upload_path = trim( get_option( 'upload_path' ) );
 			if ( empty( $upload_path ) || 'wp-content/uploads' == $upload_path ) {
 				$dir = WP_CONTENT_DIR . '/uploads';
@@ -615,12 +618,11 @@ static public function wp_upload_dir() {
 
 			$dir = rtrim( $dir, DIRECTORY_SEPARATOR );
 
-			$wp_upload_dir[ $blog_id ] = call_user_func_array( 'wp_upload_dir', func_get_args() );
+			$wp_upload_dir[ $blog_id ] = call_user_func_array( 'wp_upload_dir', array( $time ) );
 			$wp_upload_dir[ $blog_id ]['reldir'] = substr( $wp_upload_dir[ $blog_id ]['basedir'], strlen( $dir ) );
 			$wp_upload_dir[ $blog_id ]['uploads'] = $dir;
 		}
 
 		return $wp_upload_dir[ $blog_id ];
 	}
-
 }

js/windows-azure-storage-admin.js

@@ -1,4 +1,4 @@
-/*!  - v4.3.1
+/*!  - v4.3.2
  * https://github.com/10up/windows-azure-storage#readme
  * Copyright (c) 2019; */
 (function ( $, window, undefined ) {

js/windows-azure-storage-media-browser.js

@@ -1,4 +1,4 @@
-/*!  - v4.3.1
+/*!  - v4.3.2
  * https://github.com/10up/windows-azure-storage#readme
  * Copyright (c) 2019; */
 window.wp = window.wp || {};