Fixes a couple of regressions & tests (#17358)

* Fix regression in feedback js

* fix some more feedback regressions

* update submodule

* fix site selection when creating a new user

* fix ui test

3 files changed, 10 insertions, 7 deletions

diff --git a/plugins/Feedback/angularjs/refer-banner/refer-banner.controller.js b/plugins/Feedback/angularjs/refer-banner/refer-banner.controller.js
index fb18a6b7ff..7bd6db7c73 100644
--- a/plugins/Feedback/angularjs/refer-banner/refer-banner.controller.js
+++ b/plugins/Feedback/angularjs/refer-banner/refer-banner.controller.js
@@ -41,7 +41,7 @@
 
                 var params = { 'text': text, 'url': url};
                 var paramString = '';
-                for (const param in params) {
+                for (var param in params) {
                     paramString += param + '=' + encodeURIComponent(params[param]) + '&';
                 }
 
@@ -53,7 +53,7 @@
 
                 var params = { 't': text, 'u': url};
                 var paramString = '';
-                for (const param in params) {
+                for (var param in params) {
                     paramString += param + '=' + encodeURIComponent(params[param]) + '&';
                 }
 
@@ -65,7 +65,7 @@
 
                 var params = { 'url': url };
                 var paramString = '';
-                for (const param in params) {
+                for (var param in params) {
                     paramString += param + '=' + encodeURIComponent(params[param]) + '&';
                 }
 
diff --git a/plugins/Feedback/lang/en.json b/plugins/Feedback/lang/en.json
index de60599b62..4a392a4560 100644
--- a/plugins/Feedback/lang/en.json
+++ b/plugins/Feedback/lang/en.json
@@ -47,7 +47,7 @@
         "ReferBannerTitle": "Don't let your friend's data end up in the wrong hands!",
         "ReferBannerLonger": "Refer them to Matomo Analytics now to take back control!",
         "ReferBannerEmailShareSubject": "Refer them to Matomo Analytics now to take back control!",
-        "ReferBannerEmailShareBody": "I choose Matomo, an ethical alternative to Google Analytics that gives me 100% data ownership and protects the data of my website visitors.\r\nI’m sharing this message in the hope that you too will take back the power from Google and get complete ownership of your own data.\r\n\r\nCheck out Matomo at https://matomo.org",
+        "ReferBannerEmailShareBody": "I choose Matomo, an ethical alternative to Google Analytics that gives me 100%% data ownership and protects the data of my website visitors.\r\nI’m sharing this message in the hope that you too will take back the power from Google and get complete ownership of your own data.\r\n\r\nCheck out Matomo at https://matomo.org",
         "ReferBannerSocialShareText": "If you’re using Google Analytics, stay in control by switching to an ethical alternative like Matomo now!"
     }
 }
diff --git a/plugins/Feedback/tests/Integration/ReferBannerTest.php b/plugins/Feedback/tests/Integration/ReferBannerTest.php
index b7b86aeae3..6e33a73604 100644
--- a/plugins/Feedback/tests/Integration/ReferBannerTest.php
+++ b/plugins/Feedback/tests/Integration/ReferBannerTest.php
@@ -6,8 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\Feedback\tests\Unit;
-
+namespace Piwik\Plugins\Feedback\tests\Integration;
 
 use Piwik\Date;
 use Piwik\Option;
@@ -46,7 +45,11 @@ class ReferBannerTest extends IntegrationTestCase
     public function tearDown(): void
     {
         Option::deleteLike('Feedback.nextReferReminder.%');
-        $this->userModel->deleteUserOnly('user1');
+        try {
+            $this->userModel->deleteUserOnly('user1');
+        } catch (\Exception $e) {
+            // ignore possible errors triggered when the delete user event is posted
+        }
 
         parent::tearDown();
     }