From c6f2fb054d58401918cc04700ce5905528886f47 Mon Sep 17 00:00:00 2001
From: Maxim Medinskiy <mmedinskiy@ebay.com>
Date: Thu, 29 Oct 2015 17:30:40 +0200
Subject: [PATCH] MAGETWO-44723: Errors related to mixed content after
 redirecting from wishlist to product page when secure URLs for storefront
 used

---
 app/code/Magento/Review/Block/Form.php           | 8 +++++++-
 app/code/Magento/Review/Block/Product/Review.php | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Review/Block/Form.php b/app/code/Magento/Review/Block/Form.php
index 2bcc859bdd4..61183ec7ceb 100644
--- a/app/code/Magento/Review/Block/Form.php
+++ b/app/code/Magento/Review/Block/Form.php
@@ -158,7 +158,13 @@ class Form extends \Magento\Framework\View\Element\Template
      */
     public function getAction()
     {
-        return $this->getUrl('review/product/post', ['id' => $this->getProductId()]);
+        return $this->getUrl(
+            'review/product/post',
+            [
+                '_secure' => $this->_request->isSecure(),
+                'id' => $this->getProductId(),
+            ]
+        );
     }
 
     /**
diff --git a/app/code/Magento/Review/Block/Product/Review.php b/app/code/Magento/Review/Block/Product/Review.php
index 02764dc5123..b6d03c885d6 100644
--- a/app/code/Magento/Review/Block/Product/Review.php
+++ b/app/code/Magento/Review/Block/Product/Review.php
@@ -66,7 +66,13 @@ class Review extends Template implements IdentityInterface
      */
     public function getProductReviewUrl()
     {
-        return $this->getUrl('review/product/listAjax', ['id' => $this->getProductId()]);
+        return $this->getUrl(
+            'review/product/listAjax',
+            [
+                '_secure' => $this->_request->isSecure(),
+                'id' => $this->getProductId(),
+            ]
+        );
     }
 
     /**
-- 
GitLab