MAGETWO-70736: Added ability generate unsecure URL if current URL is secure #10244

Oleksii Korshenko · Oleksii Korshenko · commit 4e82153e6acb · 2017-07-14T09:46:31.000-05:00
- Merge Pull Request #10244 from okorshenko/magento2:okorshenko-patch-2 - Merged commits: 1. 9668c3e
diff --git a/lib/internal/Magento/Framework/Url.php b/lib/internal/Magento/Framework/Url.php
@@ -389,6 +389,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
`@@ -389,6 +389,9 @@ protected function _getType()`
`389`	`389`	`protected function _isSecure()`
`390`	`390`	`{`
`391`	`391`	`if ($this->_request->isSecure()) {`
	`392`	`+ if($this->getRouteParamsResolver()->hasData('secure')){`
	`393`	`+ return (bool) $this->getRouteParamsResolver()->getData('secure');`
	`394`	`+ }`
`392`	`395`	`return true;`
`393`	`396`	`}`
`394`	`397`