From e1bc624715984d3f79ad7fbe3b2ea5b549d02678 Mon Sep 17 00:00:00 2001 From: Arshad M Date: Sat, 8 Jul 2017 16:38:37 +0530 Subject: [PATCH 1/3] magento/magento2:#6175 Fixed Unable to generate unsecure URL if current URL is secure --- lib/internal/Magento/Framework/Url.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/Url.php b/lib/internal/Magento/Framework/Url.php index 9b2e6cf2043ea..ce79c26b43919 100644 --- a/lib/internal/Magento/Framework/Url.php +++ b/lib/internal/Magento/Framework/Url.php @@ -361,10 +361,14 @@ protected function _getType() */ protected function _isSecure() { - if ($this->_request->isSecure()) { + if ($this->_request->isSecure() && !$this->getRouteParamsResolver()->hasData('secure')) { return true; } + if($this->getRouteParamsResolver()->hasData('secure')){ + return (bool) $this->getRouteParamsResolver()->getData('secure'); + } + if ($this->getRouteParamsResolver()->hasData('secure_is_forced')) { return (bool) $this->getRouteParamsResolver()->getData('secure'); } From 2e6a2029855964799ffb7ed6d0858783a7c9f5ca Mon Sep 17 00:00:00 2001 From: Arshad M Date: Sat, 8 Jul 2017 17:20:20 +0530 Subject: [PATCH 2/3] magento/magento2:#6175 Unable to generate unsecure URL if current URL is secure added inside --- lib/internal/Magento/Framework/Url.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/internal/Magento/Framework/Url.php b/lib/internal/Magento/Framework/Url.php index ce79c26b43919..081ddb7c8aa16 100644 --- a/lib/internal/Magento/Framework/Url.php +++ b/lib/internal/Magento/Framework/Url.php @@ -362,13 +362,12 @@ protected function _getType() protected function _isSecure() { if ($this->_request->isSecure() && !$this->getRouteParamsResolver()->hasData('secure')) { + if($this->getRouteParamsResolver()->hasData('secure')){ + return (bool) $this->getRouteParamsResolver()->getData('secure'); + } return true; } - if($this->getRouteParamsResolver()->hasData('secure')){ - return (bool) $this->getRouteParamsResolver()->getData('secure'); - } - if ($this->getRouteParamsResolver()->hasData('secure_is_forced')) { return (bool) $this->getRouteParamsResolver()->getData('secure'); } From 839ea2faae489e987ca91cdb422acd267365f0f6 Mon Sep 17 00:00:00 2001 From: Arshad M Date: Sat, 8 Jul 2017 23:51:35 +0530 Subject: [PATCH 3/3] magento/magento2:#6175 Unable to generate unsecure URL if current URL is secure - code cleaned --- lib/internal/Magento/Framework/Url.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/Url.php b/lib/internal/Magento/Framework/Url.php index 081ddb7c8aa16..5a7ab7c1146dd 100644 --- a/lib/internal/Magento/Framework/Url.php +++ b/lib/internal/Magento/Framework/Url.php @@ -361,7 +361,7 @@ protected function _getType() */ protected function _isSecure() { - if ($this->_request->isSecure() && !$this->getRouteParamsResolver()->hasData('secure')) { + if ($this->_request->isSecure()) { if($this->getRouteParamsResolver()->hasData('secure')){ return (bool) $this->getRouteParamsResolver()->getData('secure'); }