Merge remote-tracking branch 'origin/MAGETWO-44723' into BUGS

Oleksandr Karpenko · Oleksandr Karpenko · commit c6100468e592 · 2015-10-29T19:03:08.000+02:00
diff --git a/app/code/Magento/Review/Block/Form.php b/app/code/Magento/Review/Block/Form.php
@@ -158,7 +158,13 @@ public function getProductInfo()
      */
     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
@@ -66,7 +66,13 @@ public function getProductId()
      */
     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(),
+            ]
+        );
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,13 @@ public function getProductInfo()`
`158`	`158`	`*/`
`159`	`159`	`public function getAction()`
`160`	`160`	`{`
`161`		`- return $this->getUrl('review/product/post', ['id' => $this->getProductId()]);`
	`161`	`+ return $this->getUrl(`
	`162`	`+ 'review/product/post',`
	`163`	`+ [`
	`164`	`+ '_secure' => $this->_request->isSecure(),`
	`165`	`+ 'id' => $this->getProductId(),`
	`166`	`+ ]`
	`167`	`+ );`
`162`	`168`	`}`
`163`	`169`
`164`	`170`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,13 @@ public function getProductId()`
`66`	`66`	`*/`
`67`	`67`	`public function getProductReviewUrl()`
`68`	`68`	`{`
`69`		`- return $this->getUrl('review/product/listAjax', ['id' => $this->getProductId()]);`
	`69`	`+ return $this->getUrl(`
	`70`	`+ 'review/product/listAjax',`
	`71`	`+ [`
	`72`	`+ '_secure' => $this->_request->isSecure(),`
	`73`	`+ 'id' => $this->getProductId(),`
	`74`	`+ ]`
	`75`	`+ );`
`70`	`76`	`}`
`71`	`77`
`72`	`78`	`/**`