From 45cd48afb49366ce36e919d77a4eb6513c045cf5 Mon Sep 17 00:00:00 2001 From: rMalie Date: Mon, 27 Feb 2012 15:18:51 +0000 Subject: [PATCH] // Display of payment modules per shop #PSTEST-833 --- classes/controller/AdminController.php | 4 ++-- controllers/admin/AdminPaymentController.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index d3d2f98ce..dc406ba23 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -309,6 +309,8 @@ class AdminControllerCore extends Controller $this->tpl_folder = Tools::toUnderscoreCase(substr($this->controller_name, 5)).'/'; $this->context->currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT')); + + $this->initShopContext(); } /** @@ -1645,8 +1647,6 @@ class AdminControllerCore extends Controller $this->lite_display = true; } - $this->initShopContext(); - if ($this->ajax && method_exists($this, 'ajaxPreprocess')) $this->ajaxPreProcess(); diff --git a/controllers/admin/AdminPaymentController.php b/controllers/admin/AdminPaymentController.php index a66b6b01a..af226e6bc 100644 --- a/controllers/admin/AdminPaymentController.php +++ b/controllers/admin/AdminPaymentController.php @@ -31,6 +31,8 @@ class AdminPaymentControllerCore extends AdminController public function __construct() { + parent::__construct(); + $shop_id = Context::getContext()->shop->id; /* Get all modules then select only payment ones */ @@ -80,8 +82,6 @@ class AdminPaymentControllerCore extends AdminController $this->payment_modules[] = $module; } - - parent::__construct(); } public function postProcess()