From e33d721a4cbab299f15790d9d5f81be324ea62d6 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Fri, 6 Dec 2024 17:06:28 +0800
Subject: [PATCH] Fixes for frontend

---
 ...convertkit-admin-settings-restrict-content.php |  2 +-
 views/frontend/restrict-content/tag.php           | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/admin/class-convertkit-admin-settings-restrict-content.php b/admin/class-convertkit-admin-settings-restrict-content.php
index 93b8bcc8..5eb43144 100644
--- a/admin/class-convertkit-admin-settings-restrict-content.php
+++ b/admin/class-convertkit-admin-settings-restrict-content.php
@@ -407,7 +407,7 @@ public function number_callback( $args ) {
 			esc_attr( $args['min'] ),
 			esc_attr( $args['max'] ),
 			esc_attr( $args['step'] ),
-			esc_html( $args['description'] ),
+			$args['description'], // phpcs:ignore WordPress.Security.EscapeOutput
 			array(
 				'widefat',
 			)
diff --git a/views/frontend/restrict-content/tag.php b/views/frontend/restrict-content/tag.php
index 82758027..57766203 100644
--- a/views/frontend/restrict-content/tag.php
+++ b/views/frontend/restrict-content/tag.php
@@ -29,15 +29,18 @@
 				// Output submit button, depending on whether Google reCAPTCHA is enabled.
 				if ( $this->restrict_content_settings->has_recaptcha_site_and_secret_keys() ) {
 					?>
-					<button class="wp-block-button__link wp-block-button__link g-recaptcha" data-sitekey="<?php echo esc_attr( $this->restrict_content_settings->get_recaptcha_site_key() ); ?>" data-callback="convertKitRestrictContentTagFormSubmit" data-action="convertkit_restrict_content_tag">
-						<?php echo esc_attr( $this->restrict_content_settings->get_by_key( 'subscribe_button_label' ) ); ?>
-					</button>
+					<input type="submit"
+							class="wp-block-button__link wp-block-button__link g-recaptcha"
+							data-sitekey="<?php echo esc_attr( $this->restrict_content_settings->get_recaptcha_site_key() ); ?>"
+							data-callback="convertKitRestrictContentTagFormSubmit"
+							data-action="convertkit_restrict_content_tag"
+							value="<?php echo esc_attr( $this->restrict_content_settings->get_by_key( 'subscribe_button_label' ) ); ?>" />
 					<?php
 				} else {
 					?>
-					<button class="wp-block-button__link wp-block-button__link">
-						<?php echo esc_attr( $this->restrict_content_settings->get_by_key( 'subscribe_button_label' ) ); ?>
-					</button>
+					<input type="submit"
+							class="wp-block-button__link wp-block-button__link"
+							value="<?php echo esc_attr( $this->restrict_content_settings->get_by_key( 'subscribe_button_label' ) ); ?>" />
 					<?php
 				}
 				?>