From 53a94c73120136cbd935ad201d3491bd81b400f0 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Wed, 23 Apr 2014 20:48:17 +0200 Subject: [PATCH] add route parameters to redirectToRoute method in BaseFrontController --- .../Thelia/Controller/Front/BaseFrontController.php | 4 ++-- .../Thelia/Module/BasePaymentModuleController.php | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/core/lib/Thelia/Controller/Front/BaseFrontController.php b/core/lib/Thelia/Controller/Front/BaseFrontController.php index 953eec515..e9bc4754b 100644 --- a/core/lib/Thelia/Controller/Front/BaseFrontController.php +++ b/core/lib/Thelia/Controller/Front/BaseFrontController.php @@ -42,9 +42,9 @@ class BaseFrontController extends BaseController * @param array $urlParameters the URL parametrs, as a var/value pair array * @param bool $referenceType */ - public function redirectToRoute($routeId, $urlParameters = array(), $referenceType = Router::ABSOLUTE_PATH) + public function redirectToRoute($routeId, array $urlParameters = [], array $routeParameters = [], $referenceType = Router::ABSOLUTE_PATH) { - $this->redirect(URL::getInstance()->absoluteUrl($this->getRoute($routeId, array(), $referenceType), $urlParameters)); + $this->redirect(URL::getInstance()->absoluteUrl($this->getRoute($routeId, $routeParameters, $referenceType), $urlParameters)); } public function checkAuth() diff --git a/core/lib/Thelia/Module/BasePaymentModuleController.php b/core/lib/Thelia/Module/BasePaymentModuleController.php index b6668a814..8c13c219b 100644 --- a/core/lib/Thelia/Module/BasePaymentModuleController.php +++ b/core/lib/Thelia/Module/BasePaymentModuleController.php @@ -156,9 +156,10 @@ abstract class BasePaymentModuleController extends BaseFrontController $this->redirectToRoute( 'order.placed', - array( + [], + [ 'order_id' => $order_id - ), + ], Router::ABSOLUTE_PATH ); } @@ -169,16 +170,17 @@ abstract class BasePaymentModuleController extends BaseFrontController * @param int $order_id the order ID * @param string|null $message an error message. */ - public function redirectToFailurePage($order_id, $message = null) + public function redirectToFailurePage($order_id, $message) { $this->getLog()->addInfo("Redirecting customer to payment failure page"); $this->redirectToRoute( 'order.failed', - array( + [], + [ 'order_id' => $order_id, 'message' => $message - ), + ], Router::ABSOLUTE_PATH ); }