MC-33148: A link to resend a confirmation email is not clickable

MC-33203: Corrupted compare products page when switch store view

Author: VladimirZaets

app/code/Magento/Catalog/Helper/Output.php

@@ -182,7 +182,7 @@ public function productAttribute($product, $attributeHtml, $attributeName)
         if ($attributeHtml !== null
             && $attribute->getIsHtmlAllowedOnFront()
             && $attribute->getIsWysiwygEnabled()
-            && $this->isDirectivesExists($attributeHtml)
+            && $this->isDirectivesExists((string)$attributeHtml)
         ) {
             $attributeHtml = $this->_getTemplateProcessor()->filter($attributeHtml);
         }

app/code/Magento/Customer/Controller/Account/Confirm.php

@@ -168,7 +168,7 @@ public function execute()
                 $metadata->setPath('/');
                 $this->getCookieManager()->deleteCookie('mage-cache-sessid', $metadata);
             }
-            $this->messageManager->addSuccessMessage($this->getSuccessMessage());
+            $this->messageManager->addSuccess($this->getSuccessMessage());
             $resultRedirect->setUrl($this->getSuccessRedirect());
             return $resultRedirect;
         } catch (StateException $e) {

app/code/Magento/Customer/Controller/Account/LoginPost.php

@@ -218,7 +218,7 @@ public function execute()
                     );
                 } finally {
                     if (isset($message)) {
-                        $this->messageManager->addErrorMessage($message);
+                        $this->messageManager->addError($message);
                         $this->session->setUsername($login['username']);
                     }
                 }

app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php

@@ -282,7 +282,7 @@ public function testSuccessMessage($customerId, $key, $vatValidationEnabled, $ad
             ->willReturnSelf();
 
         $this->messageManagerMock->expects($this->any())
-            ->method('addSuccessMessage')
+            ->method('addSuccess')
             ->with($this->stringContains($successMessage))
             ->willReturnSelf();
 
@@ -402,7 +402,7 @@ public function testSuccessRedirect(
             ->willReturnSelf();
 
         $this->messageManagerMock->expects($this->any())
-            ->method('addSuccessMessage')
+            ->method('addSuccess')
             ->with($this->stringContains($successMessage))
             ->willReturnSelf();
 

app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php

@@ -557,7 +557,7 @@ protected function mockExceptions($exception, $username)
                     $url
                 );
                 $this->messageManager->expects($this->once())
-                    ->method('addErrorMessage')
+                    ->method('addError')
                     ->with($message)
                     ->willReturnSelf();