From 19784046fbff230c7a283254f79c19f07d8407d5 Mon Sep 17 00:00:00 2001
From: dizzy <diosmosis@users.noreply.github.com>
Date: Sun, 8 Sep 2024 14:00:39 -0700
Subject: [PATCH] version 5.1.3 tweaks (typo and escaping an id) (#1193)

* version 5.1.3 tweaks (typo and escaping an id)

* update expected screenshots
---
 classes/WpMatomo/Admin/TrackingSettings/Forms.php            | 4 ++--
 classes/WpMatomo/Admin/views/info.php                        | 2 +-
 tests/e2e/baseline/desktop_firefox/mwp-admin.about.png       | 4 ++--
 tests/e2e/baseline/desktop_firefox/mwp-admin.about.trunk.png | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/classes/WpMatomo/Admin/TrackingSettings/Forms.php b/classes/WpMatomo/Admin/TrackingSettings/Forms.php
index 56e2e239c..8a0a9886c 100644
--- a/classes/WpMatomo/Admin/TrackingSettings/Forms.php
+++ b/classes/WpMatomo/Admin/TrackingSettings/Forms.php
@@ -223,7 +223,7 @@ public function show_radio( $id, $name, $options = [], $description = '', $on_ch
 					. $desc,
 					( $tooltip ? ' title="' . esc_attr( $tooltip ) . '"' : '' ),
 					$radio_id,
-					esc_attr( TrackingSettings::FORM_NAME ) . '[' . $id . ']',
+					esc_attr( TrackingSettings::FORM_NAME ) . '[' . esc_attr( $id ) . ']',
 					esc_attr( $key ),
 					// phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
 					( $key == $default ? 'checked="checked"' : '' ),
@@ -246,7 +246,7 @@ public function show_radio( $id, $name, $options = [], $description = '', $on_ch
 			. '</tr>',
 			esc_html( $name ),
 			$script_change,
-			$id,
+			esc_attr( $id ),
 			implode( is_array( $description ) ? '' : '<br/>', $button_list ),
 			is_array( $description ) ? '' : $this->get_description( $id, $description, $hide_description )
 		);
diff --git a/classes/WpMatomo/Admin/views/info.php b/classes/WpMatomo/Admin/views/info.php
index 3cd112dfe..73343e4ee 100644
--- a/classes/WpMatomo/Admin/views/info.php
+++ b/classes/WpMatomo/Admin/views/info.php
@@ -54,7 +54,7 @@
 		<br/><br/>
 		<?php
 		echo sprintf(
-			esc_html__( 'Matomo will always cost you nothing to use, but that if you\'d like to support Matomo in a more meaningful way, take a look at our %1$spremium plugins%2$s.', 'matomo' ),
+			esc_html__( 'Matomo will always cost you nothing to use, but if you\'d like to support Matomo in a more meaningful way, take a look at our %1$spremium plugins%2$s.', 'matomo' ),
 			'<a href="https://plugins.matomo.org/premium" target="_blank" rel="noreferrer noopener">',
 			'</a>'
 		);
diff --git a/tests/e2e/baseline/desktop_firefox/mwp-admin.about.png b/tests/e2e/baseline/desktop_firefox/mwp-admin.about.png
index 5df0ecc84..b576ceb5a 100644
--- a/tests/e2e/baseline/desktop_firefox/mwp-admin.about.png
+++ b/tests/e2e/baseline/desktop_firefox/mwp-admin.about.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9407da3b3362f215ec080be86b04016c713e395595c2b3f032694a1b98c3f6fa
-size 223455
+oid sha256:4dfa2e436ee8e554d1fec91e197374a36903311da86204f93930755f87f9805f
+size 223241
diff --git a/tests/e2e/baseline/desktop_firefox/mwp-admin.about.trunk.png b/tests/e2e/baseline/desktop_firefox/mwp-admin.about.trunk.png
index 57dee3416..0655df12e 100644
--- a/tests/e2e/baseline/desktop_firefox/mwp-admin.about.trunk.png
+++ b/tests/e2e/baseline/desktop_firefox/mwp-admin.about.trunk.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e44d0c64a0b816ab29a7f76710795dd3fcc7c21715a99f62d5b0f40e66416772
-size 236112
+oid sha256:5272b1979dc014ac815cfef51457d30ae7a6dcd84e0fda81f9b0372b299abe1f
+size 236255