Merge branch 'release/8.0.6'

notification.php

@@ -4,7 +4,7 @@
  * Description: Customisable email and webhook notifications with powerful developer friendly API for custom triggers and notifications. Send alerts easily.
  * Author: BracketSpace
  * Author URI: https://bracketspace.com
- * Version: 8.0.5
+ * Version: 8.0.6
  * License: GPL3
  * Text Domain: notification
  * Domain Path: /languages

readme.txt

@@ -3,7 +3,7 @@ Contributors: notification, bracketspace, Kubitomakita, tomaszadamowicz, insejn,
 Tags: notification, notify, alert, email, mail, webhook, API, developer, framework
 Requires at least: 4.9
 Tested up to: 5.8
-Stable tag: 8.0.5
+Stable tag: 8.0.6
 Requires PHP: 7.0
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -295,6 +295,12 @@ Yes, just activate the debug log in the DEBUGGING section of the plugin settings
 
 == Changelog ==
 
+= 8.0.6 =
+
+* [Fixed] Extension activation notice link.
+* [Fixed] Extension activation process.
+* [Fixed] Incorrect empty merge tag cleaning which was misreading JSON format.
+
 = 8.0.5 =
 
 * [Changed] Updated PHP dependencies.

resources/templates/extension/activation-error.php

@@ -13,7 +13,7 @@
 ?>
 
 <div class="error">
-	<p><?php $the_esc( 'message' ); ?></p>
+	<p><?php echo wp_kses_post( $get( 'message' ) ); ?></p>
 	<ul style="list-style: disc; padding-left: 20px;">
 		<?php foreach ( $get( 'extensions' ) as $extension ) : ?>
 			<li><?php echo esc_html( $extension ); ?></li>

resources/templates/extension/extension-box-premium.php

@@ -48,7 +48,7 @@
 	</div>
 	<form class="plugin-card-bottom" action="<?php echo esc_attr( admin_url( 'admin-post.php' ) ); ?>" method="post">
 		<input type="hidden" name="extension" value="<?php echo esc_attr( $ext['slug'] ); ?>">
-		<?php wp_nonce_field( 'activate_extension_' . $ext['slug'] ); ?>
+		<?php wp_nonce_field( 'activate_extension_' . wp_unslash( sanitize_key( $ext['slug'] ?? '' ) ) ); ?>
 		<?php if ( empty( $license ) ) : ?>
 			<input type="hidden" name="action" value="notification_activate_extension">
 			<div class="column-license"><input type="text" name="license-key" placeholder="<?php esc_attr_e( 'License key', 'notification' ); ?>" class="widefat"></div>

src/Core/Resolver.php

@@ -53,7 +53,7 @@ public static function resolve( $value, Triggerable $trigger ) {
 	 * @return string
 	 */
 	public static function clear( $value ) {
-		return preg_replace( '/(?<!\!)\{(?:[^{}])*\}/', '', $value );
+		return preg_replace( '/(?<!\!)\{(?:[^{}\s\"\'])*\}/', '', $value );
 	}
 
 }