Make sure all Matomo emails use correct branding. (#13908)

* Make sure all Matomo emails use correct branding.

* update email logo

* reuse variables

* Change default from to Matomo Analytics.

* Fix list style in report emails, update customalerts submodule and make dashboard link got to default erport in emails.

* Updated submodule.

* Bump version + update submodules.

* Remove submodule update so plugins can be merged after rc2 merged.

1 files changed, 6 insertions, 6 deletions

diff --git a/plugins/Login/PasswordResetter.php b/plugins/Login/PasswordResetter.php
index c52bc8a6b4..9b85afd644 100644
--- a/plugins/Login/PasswordResetter.php
+++ b/plugins/Login/PasswordResetter.php
@@ -435,12 +435,12 @@ class PasswordResetter
         $mail = new Mail();
         $mail->addTo($email, $login);
         $mail->setSubject(Piwik::translate('Login_MailTopicPasswordChange'));
-        $bodyText = str_replace(
-                '\n',
-                "\n",
-                Piwik::translate('Login_MailPasswordChangeBody2', [$login, $ip, $url])
-            ) . "\n";
-        $mail->setBodyText($bodyText);
+        $bodyText = '<p>' . str_replace(
+                "\n\n",
+                "</p><p>",
+                Piwik::translate('Login_MailPasswordChangeBody2', [Common::sanitizeInputValue($login), $ip, $url])
+            ) . "</p>";
+        $mail->setWrappedHtmlBody($bodyText);
 
         $mail->setFrom($this->emailFromAddress, $this->emailFromName);