MAGETWO-70591: magento/magento2:#6175 Fixed Unable to generate unsecure URL if current URL is secure #10188

Oleksii Korshenko · Oleksii Korshenko · commit 515eb5e42f21 · 2017-07-10T15:37:15.000-05:00
- Merge Pull Request #10188 from arshadpkm/magento2:issue-6175 - Merged commits: 1. e1bc624 2. 2e6a202 3. 839ea2f
diff --git a/lib/internal/Magento/Framework/Url.php b/lib/internal/Magento/Framework/Url.php
@@ -362,6 +362,9 @@ protected function _getType()
     protected function _isSecure()
     {
         if ($this->_request->isSecure()) {
+            if($this->getRouteParamsResolver()->hasData('secure')){
+                return (bool) $this->getRouteParamsResolver()->getData('secure');
+            }
             return true;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -362,6 +362,9 @@ protected function _getType()`
`362`	`362`	`protected function _isSecure()`
`363`	`363`	`{`
`364`	`364`	`if ($this->_request->isSecure()) {`
	`365`	`+ if($this->getRouteParamsResolver()->hasData('secure')){`
	`366`	`+ return (bool) $this->getRouteParamsResolver()->getData('secure');`
	`367`	`+ }`
`365`	`368`	`return true;`
`366`	`369`	`}`
`367`	`370`