From a8e3fe79c214b78e802dcaaf17d8e9eed62e81d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ja=CC=81n=20Mikla=CC=81s=CC=8C?= <neosinner@gmail.com>
Date: Thu, 21 Mar 2019 14:37:59 +0100
Subject: [PATCH] Remove unnecessary HTML elements from strings

[MAILPOET-1882]
---
 .../Methods/ErrorMappers/MailPoetMapper.php      | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php b/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php
index c7f276bd00..db985ebab7 100644
--- a/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php
+++ b/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php
@@ -92,21 +92,15 @@ class MailPoetMapper {
   private function getUnauthorizedEmailMessage($sender, $newsletter) {
     $email = $sender ? $sender['from_email'] : null;
     if ($email && FreeDomains::isEmailOnFreeDomain($email)) {
-      $message = sprintf(__('<p>The MailPoet Sending Service can’t send email with the email address <i>%s</i>. You need to use an address like <i>‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌you@yourdomain.com</i></p>', 'mailpoet'), $email);
+      $message = '<p>' . sprintf(__('The MailPoet Sending Service can’t send email with the email address <i>%s</i>. You need to use an address like <i>‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌you@yourdomain.com</i>.', 'mailpoet'), $email) . '</p>';
       $message .= '<p>';
       if ($newsletter && $newsletter['id']) {
-        $message .= Helpers::replaceLinkTags(
-          __('[link]Change my email address[/link]', 'mailpoet'),
-          'admin.php?page=mailpoet-newsletters#/send/' . $newsletter['id'],
-          array('class' => 'button button-primary')
-        );
+        $message .= '<a class="button button-primary" href="admin.php?page=mailpoet-newsletters#/send/' . $newsletter['id'] .'">';
       } else {
-        $message .= Helpers::replaceLinkTags(
-          __('[link]Change my email address[/link]', 'mailpoet'),
-          'admin.php?page=mailpoet-settings',
-          array('class' => 'button button-primary')
-        );
+        $message .= '<a class="button button-primary" href="admin.php?page=mailpoet-settings">';
       }
+      $message .= __('Change my email address', 'mailpoet');
+      $message .= '</a>';
     } else {
       $message = sprintf(__('<p>The MailPoet Sending Service did not send your latest email because the address <i>%s</i> is not yet authorized.</p>', 'mailpoet'), $email ?: __('Unknown address'));
       $message .= '<p>';