diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php index 75e2b96e7..3e7e090e4 100644 --- a/controllers/front/AddressController.php +++ b/controllers/front/AddressController.php @@ -285,6 +285,7 @@ class AddressControllerCore extends FrontController } $this->setTemplate(_PS_THEME_DIR_.'address.tpl'); + parent::initContent(); } /** diff --git a/controllers/front/AddressesController.php b/controllers/front/AddressesController.php index 4ad848c93..1e6221dc3 100644 --- a/controllers/front/AddressesController.php +++ b/controllers/front/AddressesController.php @@ -102,6 +102,7 @@ class AddressesControllerCore extends FrontController )); $this->setTemplate(_PS_THEME_DIR_.'addresses.tpl'); + parent::initContent(); } } diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php index 60ee95620..c68eb2464 100644 --- a/controllers/front/AuthController.php +++ b/controllers/front/AuthController.php @@ -146,6 +146,7 @@ class AuthControllerCore extends FrontController die(Tools::jsonEncode($return)); } $this->setTemplate(_PS_THEME_DIR_.'authentication.tpl'); + parent::initContent(); } /** diff --git a/controllers/front/BestSalesController.php b/controllers/front/BestSalesController.php index f9c720e92..92596ea80 100644 --- a/controllers/front/BestSalesController.php +++ b/controllers/front/BestSalesController.php @@ -43,6 +43,7 @@ class BestSalesControllerCore extends FrontController )); $this->setTemplate(_PS_THEME_DIR_.'best-sales.tpl'); + parent::initContent(); } public function setMedia() diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php index 618ed7418..4f78722ce 100644 --- a/controllers/front/CartController.php +++ b/controllers/front/CartController.php @@ -249,6 +249,7 @@ class CartControllerCore extends FrontController public function initContent() { $this->setTemplate(_PS_THEME_DIR_.'errors.tpl'); + parent::initContent(); } /** diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php index 11f6691af..543da1ff2 100644 --- a/controllers/front/CategoryController.php +++ b/controllers/front/CategoryController.php @@ -111,6 +111,7 @@ class CategoryControllerCore extends FrontController $this->setTemplate(_PS_THEME_DIR_.'category.tpl'); + parent::initContent(); } /** diff --git a/controllers/front/CmsController.php b/controllers/front/CmsController.php index 6da1f3c26..10e2fa471 100644 --- a/controllers/front/CmsController.php +++ b/controllers/front/CmsController.php @@ -107,5 +107,6 @@ class CmsControllerCore extends FrontController } $this->setTemplate(_PS_THEME_DIR_.'cms.tpl'); + parent::initContent(); } } diff --git a/controllers/front/CompareController.php b/controllers/front/CompareController.php index b63916036..3927729c3 100644 --- a/controllers/front/CompareController.php +++ b/controllers/front/CompareController.php @@ -153,6 +153,7 @@ class CompareControllerCore extends FrontController $this->context->smarty->assign('hasProduct', $hasProduct); $this->setTemplate(_PS_THEME_DIR_.'products-comparison.tpl'); + parent::initContent(); } } diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php index 908d7d5f4..7d525b4c7 100644 --- a/controllers/front/ContactController.php +++ b/controllers/front/ContactController.php @@ -220,6 +220,7 @@ class ContactControllerCore extends FrontController )); $this->setTemplate(_PS_THEME_DIR_.'contact-form.tpl'); + parent::initContent(); } /** diff --git a/controllers/front/DiscountController.php b/controllers/front/DiscountController.php index e9acfa7fc..4283bcf4b 100644 --- a/controllers/front/DiscountController.php +++ b/controllers/front/DiscountController.php @@ -46,6 +46,7 @@ class DiscountControllerCore extends FrontController $this->context->smarty->assign(array('nbDiscounts' => (int)($nbDiscounts), 'discount' => $discounts)); $this->setTemplate(_PS_THEME_DIR_.'discount.tpl'); + parent::initContent(); } } diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php index 7f4e50ce6..e001d6188 100644 --- a/controllers/front/GuestTrackingController.php +++ b/controllers/front/GuestTrackingController.php @@ -105,6 +105,7 @@ class GuestTrackingControllerCore extends FrontController 'errors' => $this->errors, )); $this->setTemplate(_PS_THEME_DIR_.'guest-tracking.tpl'); + parent::initContent(); } /** diff --git a/controllers/front/HistoryController.php b/controllers/front/HistoryController.php index 7a78de1ef..706991f63 100644 --- a/controllers/front/HistoryController.php +++ b/controllers/front/HistoryController.php @@ -64,6 +64,7 @@ class HistoryControllerCore extends FrontController )); $this->setTemplate(_PS_THEME_DIR_.'history.tpl'); + parent::initContent(); } } diff --git a/controllers/front/IdentityController.php b/controllers/front/IdentityController.php index 00fda25e7..d2d7deba3 100644 --- a/controllers/front/IdentityController.php +++ b/controllers/front/IdentityController.php @@ -136,6 +136,7 @@ class IdentityControllerCore extends FrontController $this->context->smarty->assign('newsletter', (int)Module::getInstanceByName('blocknewsletter')->active); $this->setTemplate(_PS_THEME_DIR_.'identity.tpl'); + parent::initContent(); } public function setMedia() diff --git a/controllers/front/IndexController.php b/controllers/front/IndexController.php index e88b04c8f..eb91186b7 100644 --- a/controllers/front/IndexController.php +++ b/controllers/front/IndexController.php @@ -35,7 +35,8 @@ class IndexControllerCore extends FrontController */ public function initContent() { - $this->context->smarty->assign('HOOK_HOME', Hook::exec('home')); + $this->context->smarty->assign('HOOK_HOME', Hook::exec('displayHome')); $this->setTemplate(_PS_THEME_DIR_.'index.tpl'); + parent::initContent(); } } diff --git a/controllers/front/ManufacturerController.php b/controllers/front/ManufacturerController.php index 7298a7f57..226e37e5a 100644 --- a/controllers/front/ManufacturerController.php +++ b/controllers/front/ManufacturerController.php @@ -81,6 +81,7 @@ class ManufacturerControllerCore extends FrontController $this->assignAll(); $this->setTemplate(_PS_THEME_DIR_.'manufacturer-list.tpl'); } + parent::initContent(); } /** diff --git a/controllers/front/ModuleController.php b/controllers/front/ModuleController.php index 2d9af4a6f..f4a8d9268 100644 --- a/controllers/front/ModuleController.php +++ b/controllers/front/ModuleController.php @@ -58,5 +58,6 @@ class ModuleControllerCore extends FrontController $this->setTemplate($module->$method()); else die('Module action not found'); + parent::initContent(); } } diff --git a/controllers/front/MyAccountController.php b/controllers/front/MyAccountController.php index a2907abc4..49df1a220 100644 --- a/controllers/front/MyAccountController.php +++ b/controllers/front/MyAccountController.php @@ -51,6 +51,7 @@ class MyAccountControllerCore extends FrontController $this->context->smarty->assign('HOOK_CUSTOMER_ACCOUNT', Hook::exec('customerAccount')); $this->setTemplate(_PS_THEME_DIR_.'my-account.tpl'); + parent::initContent(); } } diff --git a/controllers/front/NewProductsController.php b/controllers/front/NewProductsController.php index 31f311f7b..ff3e91649 100644 --- a/controllers/front/NewProductsController.php +++ b/controllers/front/NewProductsController.php @@ -60,6 +60,7 @@ class NewProductsControllerCore extends FrontController )); $this->setTemplate(_PS_THEME_DIR_.'new-products.tpl'); + parent::initContent(); } } diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php index 9ce74a292..339c7e169 100644 --- a/controllers/front/OrderConfirmationController.php +++ b/controllers/front/OrderConfirmationController.php @@ -87,6 +87,7 @@ class OrderConfirmationControllerCore extends FrontController } $this->setTemplate(_PS_THEME_DIR_.'order-confirmation.tpl'); + parent::initContent(); } } diff --git a/controllers/front/OrderController.php b/controllers/front/OrderController.php index 8ed1d2225..efe44b4f0 100644 --- a/controllers/front/OrderController.php +++ b/controllers/front/OrderController.php @@ -161,6 +161,7 @@ class OrderControllerCore extends ParentOrderController 'currencyFormat' => $this->context->currency->format, 'currencyBlank' => $this->context->currency->blank, )); + parent::initContent(); } private function processAddressFormat() diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php index 7928b2749..eadb3f705 100644 --- a/controllers/front/OrderDetailController.php +++ b/controllers/front/OrderDetailController.php @@ -203,6 +203,7 @@ class OrderDetailControllerCore extends FrontController } $this->setTemplate(_PS_THEME_DIR_.'order-detail.tpl'); + parent::initContent(); } public function setMedia() diff --git a/controllers/front/OrderFollowController.php b/controllers/front/OrderFollowController.php index 7b23f1b4e..3d6be67fe 100644 --- a/controllers/front/OrderFollowController.php +++ b/controllers/front/OrderFollowController.php @@ -93,6 +93,7 @@ class OrderFollowControllerCore extends FrontController $this->context->smarty->assign('ordersReturn', $ordersReturn); $this->setTemplate(_PS_THEME_DIR_.'order-follow.tpl'); + parent::initContent(); } public function setMedia() diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php index ab6062ecb..269c04918 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -315,6 +315,7 @@ class OrderOpcControllerCore extends ParentOrderController $this->_processAddressFormat(); $this->setTemplate(_PS_THEME_DIR_.'order-opc.tpl'); + parent::initContent(); } protected function _getGuestInformations() diff --git a/controllers/front/OrderReturnController.php b/controllers/front/OrderReturnController.php index e3eef1518..748c31726 100644 --- a/controllers/front/OrderReturnController.php +++ b/controllers/front/OrderReturnController.php @@ -83,6 +83,7 @@ class OrderReturnControllerCore extends FrontController 'nbdaysreturn' => (int)(Configuration::get('PS_ORDER_RETURN_NB_DAYS')) )); $this->setTemplate(_PS_THEME_DIR_.'order-return.tpl'); + parent::initContent(); } public function displayAjax() diff --git a/controllers/front/OrderSlipController.php b/controllers/front/OrderSlipController.php index 854f54254..2837a7729 100644 --- a/controllers/front/OrderSlipController.php +++ b/controllers/front/OrderSlipController.php @@ -49,6 +49,7 @@ class OrderSlipControllerCore extends FrontController { $this->context->smarty->assign('ordersSlip', OrderSlip::getOrdersSlip((int)$this->context->cookie->id_customer)); $this->setTemplate(_PS_THEME_DIR_.'order-slip.tpl'); + parent::initContent(); } } diff --git a/controllers/front/PageNotFoundController.php b/controllers/front/PageNotFoundController.php index f126ccc06..94ec80bf0 100644 --- a/controllers/front/PageNotFoundController.php +++ b/controllers/front/PageNotFoundController.php @@ -36,6 +36,7 @@ class PageNotFoundControllerCore extends FrontController public function initContent() { $this->setTemplate(_PS_THEME_DIR_.'404.tpl'); + parent::initContent(); } } diff --git a/controllers/front/PasswordController.php b/controllers/front/PasswordController.php index 9c0c7bc6b..0ffdc2539 100644 --- a/controllers/front/PasswordController.php +++ b/controllers/front/PasswordController.php @@ -111,6 +111,7 @@ class PasswordControllerCore extends FrontController public function initContent() { $this->setTemplate(_PS_THEME_DIR_.'password.tpl'); + parent::initContent(); } } diff --git a/controllers/front/PricesDropController.php b/controllers/front/PricesDropController.php index 27d9b1276..49a941bdd 100644 --- a/controllers/front/PricesDropController.php +++ b/controllers/front/PricesDropController.php @@ -53,6 +53,7 @@ class PricesDropControllerCore extends FrontController )); $this->setTemplate(_PS_THEME_DIR_.'prices-drop.tpl'); + parent::initContent(); } } diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index f84afbd4d..3c25e20b2 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -199,6 +199,7 @@ class ProductControllerCore extends FrontController $this->context->smarty->assign('errors', $this->errors); $this->setTemplate(_PS_THEME_DIR_.'product.tpl'); + parent::initContent(); } /** diff --git a/controllers/front/SearchController.php b/controllers/front/SearchController.php index 3baafa1a8..8e85bba2f 100644 --- a/controllers/front/SearchController.php +++ b/controllers/front/SearchController.php @@ -115,6 +115,7 @@ class SearchControllerCore extends FrontController $this->context->smarty->assign('add_prod_display', Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY')); $this->setTemplate(_PS_THEME_DIR_.'search.tpl'); + parent::initContent(); } public function displayHeader($display = true) diff --git a/controllers/front/SitemapController.php b/controllers/front/SitemapController.php index 23b8e7fb9..ce18da676 100644 --- a/controllers/front/SitemapController.php +++ b/controllers/front/SitemapController.php @@ -54,5 +54,6 @@ class SitemapControllerCore extends FrontController $this->context->smarty->assign('display_store', Configuration::get('PS_STORES_DISPLAY_SITEMAP')); $this->setTemplate(_PS_THEME_DIR_.'sitemap.tpl'); + parent::initContent(); } } diff --git a/controllers/front/StoresController.php b/controllers/front/StoresController.php index ca915f9ba..9c10e6a4b 100644 --- a/controllers/front/StoresController.php +++ b/controllers/front/StoresController.php @@ -252,6 +252,7 @@ class StoresControllerCore extends FrontController )); $this->setTemplate(_PS_THEME_DIR_.'stores.tpl'); + parent::initContent(); } public function setMedia() diff --git a/controllers/front/SupplierController.php b/controllers/front/SupplierController.php index 789a51da2..a1584e592 100644 --- a/controllers/front/SupplierController.php +++ b/controllers/front/SupplierController.php @@ -83,6 +83,7 @@ class SupplierControllerCore extends FrontController $this->assignAll(); $this->setTemplate(_PS_THEME_DIR_.'supplier-list.tpl'); } + parent::initContent(); } /**