From a2cc17efaf72ee4b9befed495f9c56b1dd3a6e1c Mon Sep 17 00:00:00 2001
From: Dennis Bartuschat <dennis.bartu@gmail.com>
Date: Tue, 12 Sep 2017 09:46:49 +0200
Subject: [PATCH 1/5] cviking26_issue-9489 // added query param to url build -
 description in https://github.com/magento/magento2/issues/9489

---
 app/code/Magento/Customer/Model/Url.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Model/Url.php b/app/code/Magento/Customer/Model/Url.php
index 535cdfc1652e3..ceea88e984194 100644
--- 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', array('_query' => ['email' => $email]));
     }
 
     /**

From f9782b722f8f235257c6e94dd9c6988b5e1a4da6 Mon Sep 17 00:00:00 2001
From: Dennis Bartuschat <dennis.bartu@gmail.com>
Date: Tue, 12 Sep 2017 11:16:29 +0200
Subject: [PATCH 2/5] cviking26_issue-9489 // changed array declaration

---
 app/code/Magento/Customer/Model/Url.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Model/Url.php b/app/code/Magento/Customer/Model/Url.php
index ceea88e984194..a0ae2a4ce4669 100644
--- 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', array('_query' => ['email' => $email]));
+        return $this->urlBuilder->getUrl('customer/account/confirmation', ['_query' => ['email' => $email]]));
     }
 
     /**

From ad43b316287f67a9528e2d50a45c917d0f0f1d62 Mon Sep 17 00:00:00 2001
From: Dennis Bartuschat <dennis.bartu@gmail.com>
Date: Tue, 12 Sep 2017 11:40:02 +0200
Subject: [PATCH 3/5] cviking26_issue-9489 // syntax hotfix

---
 app/code/Magento/Customer/Model/Url.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Model/Url.php b/app/code/Magento/Customer/Model/Url.php
index a0ae2a4ce4669..f976e8c8b71aa 100644
--- 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', ['_query' => ['email' => $email]]));
+        return $this->urlBuilder->getUrl('customer/account/confirmation', ['_query' => ['email' => $email]]);
     }
 
     /**

From 4bed591a04ca99acc2a67acd46037f9164e5bf2a Mon Sep 17 00:00:00 2001
From: Quaternion <austin550055@gmail.com>
Date: Wed, 13 Sep 2017 14:35:59 -0500
Subject: [PATCH 4/5] Deprecated Magento\Store\Model\Store::$_isAdminSecure

 - added @depreated tag to unused protected property
 - closing magento/magento2#4720
---
 app/code/Magento/Store/Model/Store.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index 1d100da274465..06b04603d483b 100644
--- 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;
 

From d9bb61803fc0a89488c0fa6b7d270cf44499a560 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Thu, 14 Sep 2017 20:21:23 +0300
Subject: [PATCH 5/5] magento/magento2#10848: added query param to url build  -
 Test Updated

---
 .../testsuite/Magento/Customer/Controller/AccountTest.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
index ff5afe939d133..e1d682819b1ca 100644
--- 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
         );