From a1a1c8340e368e6118e2a23da7d48bb98de72c94 Mon Sep 17 00:00:00 2001 From: rMalie Date: Tue, 27 Sep 2011 16:21:25 +0000 Subject: [PATCH] // AddressController : refacto done git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8820 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Controller.php | 7 ++++--- controllers/front/AddressController.php | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/classes/Controller.php b/classes/Controller.php index 2e45e1c8a..ea83ca647 100644 --- a/classes/Controller.php +++ b/classes/Controller.php @@ -117,6 +117,7 @@ abstract class ControllerCore $this->setMedia(); $this->initHeader(); } + $this->initContent(); if ($this->displayFooter) $this->initFooter(); @@ -141,12 +142,12 @@ abstract class ControllerCore { $this->template = $template; } - + /** * Assign smarty variables for the page header */ abstract public function initHeader(); - + /** * Assign smarty variables for the page main content */ @@ -156,7 +157,7 @@ abstract class ControllerCore * Assign smarty variables for the page footer */ abstract public function initFooter(); - + /** * Add a new stylesheet in page header. * diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php index 3e7cb175f..d41bcb48b 100644 --- a/controllers/front/AddressController.php +++ b/controllers/front/AddressController.php @@ -98,7 +98,7 @@ class AddressControllerCore extends FrontController * Start forms process * @see FrontController::preProcess() */ - public function preProcess() + public function postProcess() { if (Tools::isSubmit('submitAddress')) $this->processSubmitAddress(); @@ -262,9 +262,9 @@ class AddressControllerCore extends FrontController /** * Assign template vars related to page content - * @see FrontController::process() + * @see FrontController::initContent() */ - public function process() + public function initContent() { /* Secure restriction for guest */ if ($this->context->customer->is_guest)