Merge pull request #1493 from magento-engcom/develop-prs

[EngCom] Public Pull Requests - MAGETWO-75114: Deprecated Magento\Store\Model\Store::$_isAdminSecure #10877 - MAGETWO-72539: cviking26_issue-9489 // added query param to url build - description … #10848
magento · Sep 14, 2017 · 659a245 · 659a245
2 parents 53072e0 + ff7a5bf
commit 659a245
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/code/Magento/Customer/Model/Url.php b/app/code/Magento/Customer/Model/Url.php
@@ -237,7 +237,7 @@ public function getForgotPasswordUrl()
      */
     public function getEmailConfirmationUrl($email = null)
     {
-        return $this->urlBuilder->getUrl('customer/account/confirmation', ['email' => $email]);
+        return $this->urlBuilder->getUrl('customer/account/confirmation', ['_query' => ['email' => $email]]);
     }
 
     /**

diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
@@ -207,6 +207,7 @@ class Store extends AbstractExtensibleModel implements
      * Flag that shows that backend URLs are secure
      *
      * @var boolean|null
+     * @deprecated unused protected property
      */
     protected $_isAdminSecure = null;
 

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
@@ -304,8 +304,8 @@ public function testWithConfirmCreatePostAction()
         $this->assertSessionMessages(
             $this->equalTo([
                 'You must confirm your account. Please check your email for the confirmation link or '
-                    . '<a href="http://localhost/index.php/customer/account/confirmation/email/'
-                    . 'test2%40email.com/">click here</a> for a new link.'
+                    . '<a href="http://localhost/index.php/customer/account/confirmation/'
+                    . '?email=test2%40email.com">click here</a> for a new link.'
             ]),
             MessageInterface::TYPE_SUCCESS
         );