From e15d85eb902f338fff8930b65dde98b8fe0ae933 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Tue, 9 Oct 2012 13:52:08 +0000 Subject: [PATCH] [-] CORE : fixed bug #PSCFV-4759 --- controllers/front/GuestTrackingController.php | 2 +- modules/bankwire/controllers/front/payment.php | 2 +- modules/blockwishlist/controllers/front/mywishlist.php | 3 +-- modules/cashondelivery/controllers/front/validation.php | 2 +- modules/cheque/controllers/front/payment.php | 2 +- modules/loyalty/controllers/front/default.php | 3 +-- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php index 04e1d53a4..f5452ab6d 100644 --- a/controllers/front/GuestTrackingController.php +++ b/controllers/front/GuestTrackingController.php @@ -29,7 +29,6 @@ class GuestTrackingControllerCore extends FrontController { public $ssl = true; public $php_self = 'guest-tracking'; - public $display_column_left = false; /** * Initialize guest tracking controller @@ -37,6 +36,7 @@ class GuestTrackingControllerCore extends FrontController */ public function init() { + $this->display_column_left = false; parent::init(); if ($this->context->customer->isLogged()) Tools::redirect('history.php'); diff --git a/modules/bankwire/controllers/front/payment.php b/modules/bankwire/controllers/front/payment.php index 4dd56b74b..893ba0642 100644 --- a/modules/bankwire/controllers/front/payment.php +++ b/modules/bankwire/controllers/front/payment.php @@ -30,7 +30,6 @@ */ class BankwirePaymentModuleFrontController extends ModuleFrontController { - public $display_column_left = false; public $ssl = true; /** @@ -38,6 +37,7 @@ class BankwirePaymentModuleFrontController extends ModuleFrontController */ public function initContent() { + $this->display_column_left = false; parent::initContent(); $cart = $this->context->cart; diff --git a/modules/blockwishlist/controllers/front/mywishlist.php b/modules/blockwishlist/controllers/front/mywishlist.php index d0cc62996..66bc0e74a 100644 --- a/modules/blockwishlist/controllers/front/mywishlist.php +++ b/modules/blockwishlist/controllers/front/mywishlist.php @@ -30,8 +30,6 @@ */ class BlockWishListMyWishListModuleFrontController extends ModuleFrontController { - public $display_column_left = false; - public function __construct() { parent::__construct(); @@ -46,6 +44,7 @@ class BlockWishListMyWishListModuleFrontController extends ModuleFrontController */ public function initContent() { + $this->display_column_left = false; parent::initContent(); $this->assign(); diff --git a/modules/cashondelivery/controllers/front/validation.php b/modules/cashondelivery/controllers/front/validation.php index 7b21968af..050d3d411 100644 --- a/modules/cashondelivery/controllers/front/validation.php +++ b/modules/cashondelivery/controllers/front/validation.php @@ -30,7 +30,6 @@ */ class CashondeliveryValidationModuleFrontController extends ModuleFrontController { - public $display_column_left = false; public $ssl = true; public function postProcess() @@ -67,6 +66,7 @@ class CashondeliveryValidationModuleFrontController extends ModuleFrontControlle */ public function initContent() { + $this->display_column_left = false; parent::initContent(); $this->context->smarty->assign(array( diff --git a/modules/cheque/controllers/front/payment.php b/modules/cheque/controllers/front/payment.php index dc0d54afc..00b80af5d 100644 --- a/modules/cheque/controllers/front/payment.php +++ b/modules/cheque/controllers/front/payment.php @@ -30,7 +30,6 @@ */ class ChequePaymentModuleFrontController extends ModuleFrontController { - public $display_column_left = false; public $ssl = true; /** @@ -38,6 +37,7 @@ class ChequePaymentModuleFrontController extends ModuleFrontController */ public function initContent() { + $this->display_column_left = false; parent::initContent(); $cart = $this->context->cart; diff --git a/modules/loyalty/controllers/front/default.php b/modules/loyalty/controllers/front/default.php index 15f31daa1..8932df1a9 100644 --- a/modules/loyalty/controllers/front/default.php +++ b/modules/loyalty/controllers/front/default.php @@ -30,8 +30,6 @@ */ class LoyaltyDefaultModuleFrontController extends ModuleFrontController { - public $display_column_left = false; - public function __construct() { parent::__construct(); @@ -125,6 +123,7 @@ class LoyaltyDefaultModuleFrontController extends ModuleFrontController */ public function initContent() { + $this->display_column_left = false; parent::initContent(); $this->context->controller->addJqueryPlugin(array('dimensions', 'cluetip'));