diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php index 42c89e3b8..651639018 100644 --- a/controllers/admin/AdminManufacturersController.php +++ b/controllers/admin/AdminManufacturersController.php @@ -360,7 +360,7 @@ class AdminManufacturersControllerCore extends AdminController return parent::renderForm(); } - public function initFormAddress() + public function renderFormAddress() { // Change table and className for addresses $this->table = 'address'; @@ -617,7 +617,7 @@ class AdminManufacturersControllerCore extends AdminController // toolbar (save, cancel, new, ..) $this->initToolbar(); if ($this->display == 'editaddresses' || $this->display == 'addaddress') - $this->content .= $this->initFormAddress(); + $this->content .= $this->renderFormAddress(); else if ($this->display == 'edit' || $this->display == 'add') { if (!$this->loadObject(true)) @@ -661,7 +661,7 @@ class AdminManufacturersControllerCore extends AdminController $this->action = 'delete'; } - public function postProcess() + public function initProcess() { if (Tools::getValue('submitAddaddress') || Tools::isSubmit('deleteaddress')) { @@ -670,7 +670,7 @@ class AdminManufacturersControllerCore extends AdminController $this->identifier = 'id_address'; $this->deleted = true; } - parent::postProcess(); + parent::initProcess(); } public function afterImageUpload() diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 328d46f5a..e00cada7a 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -978,7 +978,6 @@ class AdminTranslationsControllerCore extends AdminController foreach ($templates as $template) if (preg_match('/^(.*).tpl$/', $template)) { - //$tpl = _PS_ADMIN_DIR_.'/themes/template/'.$template; $tpl = $template; // get controller name instead of file name