Merge branch 'release/1.0.11' into legacy_master

.github/workflows/legacy-develop.yml

@@ -54,7 +54,7 @@ jobs:
         options: '--exclude-from=".build-excludes"'
         src: '.'
         dest: 'build'
-    - name: Fix permissiong
+    - name: Fix permissions
       run: sudo chown -R $USER:$USER ./
     - name: Upload artifact
       uses: actions/upload-artifact@v1

.github/workflows/legacy-stable.yml

@@ -54,6 +54,8 @@ jobs:
         options: '--exclude-from=".build-excludes"'
         src: '.'
         dest: 'build'
+    - name: Fix permissions
+      run: sudo chown -R $USER:$USER ./
     - name: Upload artifact
       uses: actions/upload-artifact@v1
       with:

easy-watermark.php

@@ -6,7 +6,7 @@
  * Author URI: https://bracketspace.com/
  * Text Domain: easy-watermark
  * Domain Path: /languages
- * Version: 1.0.10
+ * Version: 1.0.11
  * License: GPLv3 or later
  *
  * @package easy-watermark

readme.txt

@@ -4,8 +4,8 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=wojte
 Tags: watermark, image, picture, photo, media, gallery, signature, transparent, upload, admin
 Requires at least: 4.6
 Requires PHP: 5.6
-Tested up to: 5.6
-Stable tag: 1.0.10
+Tested up to: 5.7
+Stable tag: 1.0.11
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 Text Domain: easy-watermark
@@ -118,6 +118,10 @@ All available placeholders are listed in a box titled 'Placeholders' displayed w
 
 == Changelog ==
 
+= 1.0.11 =
+* [Fixed] Watermark preview url fixed to work with non-standard WordPress installations
+* [Fixed] Error in Cache Busting feature.
+
 = 1.0.10 =
 * [Added] Role existence checks during plugin activation.
 * [Added] Filter to prevent applying certain watermark.

src/classes/AttachmentProcessor/AttachmentProcessorGD.php

@@ -445,7 +445,7 @@ private function apply_image_watermark( $watermark ) {
 			$watermark_size['width']  = $new_width;
 			$watermark_size['height'] = $new_height;
 
-			unset( $tmp_image, $new_width, $nwe_height );
+			unset( $tmp_image, $new_width, $new_height );
 		}
 
 		// Compute watermark offset.

src/classes/Dashboard/Dashboard.php

@@ -81,7 +81,7 @@ public function get_page_hook() {
 	}
 
 	/**
-	 * Displats options page content
+	 * Displays options page content
 	 *
 	 * @return void
 	 */

src/classes/Features/CacheBusting.php

@@ -72,6 +72,22 @@ public function register_settings( $section ) {
 
 	}
 
+	/**
+	 * Check if this feature is active
+	 *
+	 * @return boolean
+	 */
+	private function is_active() {
+		/**
+		 * The SwitchField object should be always available by the time this method
+		 * is used. Hovewer there has been an issue reported that the
+		 * `wp_get_attachment_image_src` method caused a fatal error because
+		 * $this->switch was null. Just for safety, check if the SwitchField object
+		 * is created, if not return `true` - the default value.
+		 */
+		return $this->switch ? true === $this->switch->get_value() : true;
+	}
+
 	/**
 	 * Adds attachment version to the URL
 	 *
@@ -109,7 +125,7 @@ public function wp_get_attachment_image_src( $image, $attachment_id, $size, $ico
 			return false;
 		}
 
-		if ( true === $this->switch->get_value() ) {
+		if ( $this->is_active() ) {
 			if ( is_array( $image ) && ! empty( $image ) && is_string( $image[0] ) ) {
 				$image[0] = $this->add_attachment_version( $image[0], $attachment_id );
 			} elseif ( is_string( $image ) ) {
@@ -135,7 +151,7 @@ public function wp_get_attachment_image_src( $image, $attachment_id, $size, $ico
 	 */
 	public function wp_calculate_image_srcset( $sources, $size_array, $image_src, $image_meta, $attachment_id ) {
 
-		if ( true === $this->switch->get_value() ) {
+		if ( $this->is_active() ) {
 			foreach ( $sources as &$source ) {
 				$source['url'] = $this->add_attachment_version( $source['url'], $attachment_id );
 			}

src/classes/Features/WatermarkPreview.php

@@ -55,7 +55,7 @@ public static function get_url( $type, $watermark_id, $size = null ) {
 			}
 		}
 
-		return add_query_arg( $args, site_url( $base ) );
+		return add_query_arg( $args, home_url( $base ) );
 	}
 
 	/**

src/classes/Placeholders/Abstracts/Placeholder.php

@@ -143,7 +143,6 @@ public function reset() {
 
 		if ( $this->is_resetable() ) {
 			$this->value = null;
-			$this->data  = [];
 		}
 
 	}