From 96c8e763b90ca11d3dea7ef9729ef080156b2b8b Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Mon, 6 Feb 2012 13:41:51 +0000 Subject: [PATCH] // Replace public by protected in override methods git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13022 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminCarriersController.php | 4 ++-- controllers/admin/AdminCartRulesController.php | 4 ++-- controllers/admin/AdminCustomersController.php | 2 +- controllers/admin/AdminGroupShopController.php | 4 ++-- controllers/admin/AdminManufacturersController.php | 2 +- controllers/admin/AdminProductsController.php | 2 +- controllers/admin/AdminScenesController.php | 2 +- controllers/admin/AdminShopController.php | 4 ++-- controllers/admin/AdminSuppliersController.php | 6 +++--- controllers/admin/AdminSupplyOrdersController.php | 2 +- controllers/admin/AdminTabsController.php | 2 +- controllers/admin/AdminWarehousesController.php | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php index 744080406..0a81a374e 100644 --- a/controllers/admin/AdminCarriersController.php +++ b/controllers/admin/AdminCarriersController.php @@ -589,12 +589,12 @@ class AdminCarriersControllerCore extends AdminController $this->fields_value['groupBox_'.$group['id_group']] = Tools::getValue('groupBox_'.$group['id_group'], (in_array($group['id_group'], $carrier_groups_ids) || empty($carrier_groups_ids) && !$obj->id)); } - public function beforeDelete($object) + protected function beforeDelete($object) { return $object->isUsed(); } - public function afterDelete($object, $old_id) + protected function afterDelete($object, $old_id) { $object->copyCarrierData((int)$old_id); } diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php index b62ab0316..7a71612b5 100644 --- a/controllers/admin/AdminCartRulesController.php +++ b/controllers/admin/AdminCartRulesController.php @@ -72,7 +72,7 @@ class AdminCartRulesControllerCore extends AdminController return parent::postProcess(); } - public function afterUpdate($current_object) + protected function afterUpdate($current_object) { // All the associations are deleted for an update, then recreated when we call the "afterAdd" method $id_cart_rule = Tools::getValue('id_cart_rule'); @@ -86,7 +86,7 @@ class AdminCartRulesControllerCore extends AdminController } /* @TODO Move this function into CartRule */ - public function afterAdd($currentObject) + protected function afterAdd($currentObject) { // Add restrictions for generic entities like country, carrier and group foreach (array('country', 'carrier', 'group') as $type) diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index 1af17f953..2e2683003 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -771,7 +771,7 @@ class AdminCustomersControllerCore extends AdminController return parent::processSave($token); } - public function afterDelete($object, $old_id) + protected function afterDelete($object, $old_id) { $customer = new Customer($old_id); $addresses = $customer->getAddresses($this->default_form_language); diff --git a/controllers/admin/AdminGroupShopController.php b/controllers/admin/AdminGroupShopController.php index bd2d6788c..26364a844 100644 --- a/controllers/admin/AdminGroupShopController.php +++ b/controllers/admin/AdminGroupShopController.php @@ -272,7 +272,7 @@ class AdminGroupShopControllerCore extends AdminController return parent::postProcess(); } - public function afterAdd($new_group_shop) + protected function afterAdd($new_group_shop) { if (Tools::getValue('useImportData') && ($import_data = Tools::getValue('importData')) && is_array($import_data)) $new_group_shop->copyGroupShopData(Tools::getValue('importFromShop'), $import_data); @@ -281,7 +281,7 @@ class AdminGroupShopControllerCore extends AdminController StockAvailable::resetProductFromStockAvailableByGroupShop($new_group_shop); } - public function afterUpdate($new_group_shop) + protected function afterUpdate($new_group_shop) { if (Tools::getValue('useImportData') && ($import_data = Tools::getValue('importData')) && is_array($import_data)) $new_group_shop->copyGroupShopData(Tools::getValue('importFromShop'), $import_data); diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php index 891964685..11b845e7f 100644 --- a/controllers/admin/AdminManufacturersController.php +++ b/controllers/admin/AdminManufacturersController.php @@ -674,7 +674,7 @@ class AdminManufacturersControllerCore extends AdminController parent::initProcess(); } - public function afterImageUpload() + protected function afterImageUpload() { /* Generate image with differents size */ if (($id_manufacturer = (int)Tools::getValue('id_manufacturer')) && diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index f8b299b9b..2903fee0d 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -508,7 +508,7 @@ class AdminProductsControllerCore extends AdminController $this->errors[] = Tools::displayError('Could not find image.'); } - public function processBulkDelete($token) + protected function processBulkDelete($token) { if (is_array($this->boxes) && !empty($this->boxes)) { diff --git a/controllers/admin/AdminScenesController.php b/controllers/admin/AdminScenesController.php index def3215a9..77b2b899c 100644 --- a/controllers/admin/AdminScenesController.php +++ b/controllers/admin/AdminScenesController.php @@ -64,7 +64,7 @@ class AdminScenesControllerCore extends AdminController parent::__construct(); } - public function afterImageUpload() + protected function afterImageUpload() { /* Generate image with differents size */ if (!($obj = $this->loadObject(true))) diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php index 31a22b4bf..aae92bcb6 100755 --- a/controllers/admin/AdminShopController.php +++ b/controllers/admin/AdminShopController.php @@ -217,14 +217,14 @@ class AdminShopControllerCore extends AdminController return false; } - public function afterAdd($new_shop) + protected function afterAdd($new_shop) { if (Tools::getValue('useImportData') && ($import_data = Tools::getValue('importData')) && is_array($import_data)) $new_shop->copyShopData((int)Tools::getValue('importFromShop'), $import_data); return parent::afterAdd($new_shop); } - public function afterUpdate($new_shop) + protected function afterUpdate($new_shop) { Category::updateFromShop(Tools::getValue('categoryBox'), $new_shop->id); if (Tools::getValue('useImportData') && ($import_data = Tools::getValue('importData')) && is_array($import_data)) diff --git a/controllers/admin/AdminSuppliersController.php b/controllers/admin/AdminSuppliersController.php index 8bc18a261..5b8ddd88c 100644 --- a/controllers/admin/AdminSuppliersController.php +++ b/controllers/admin/AdminSuppliersController.php @@ -309,7 +309,7 @@ class AdminSuppliersControllerCore extends AdminController return parent::renderView(); } - public function afterImageUpload() + protected function afterImageUpload() { $return = true; /* Generate image with differents size */ @@ -407,7 +407,7 @@ class AdminSuppliersControllerCore extends AdminController /** * @see AdminController::afterAdd() */ - public function afterAdd($object) + protected function afterAdd($object) { $address = new Address($object->id_address); if (Validate::isLoadedObject($address)) @@ -422,7 +422,7 @@ class AdminSuppliersControllerCore extends AdminController /** * @see AdminController::afterUpdate() */ - public function afterUpdate($object) + protected function afterUpdate($object) { $address = new Address($object->id_address); if (Validate::isLoadedObject($address)) diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php index 876e4be48..ced847ae5 100644 --- a/controllers/admin/AdminSupplyOrdersController.php +++ b/controllers/admin/AdminSupplyOrdersController.php @@ -1944,7 +1944,7 @@ class AdminSupplyOrdersControllerCore extends AdminController * @param ObjectModel $object * @return bool */ - public function afterAdd($object) + protected function afterAdd($object) { $this->object = $object; return true; diff --git a/controllers/admin/AdminTabsController.php b/controllers/admin/AdminTabsController.php index 332f10a89..d1367cca7 100644 --- a/controllers/admin/AdminTabsController.php +++ b/controllers/admin/AdminTabsController.php @@ -281,7 +281,7 @@ class AdminTabsControllerCore extends AdminController parent::getList($id_lang, 'position', $order_way, $start, $limit, $id_lang_shop); } - public function afterImageUpload() + protected function afterImageUpload() { if (!($obj = $this->loadObject(true))) return; diff --git a/controllers/admin/AdminWarehousesController.php b/controllers/admin/AdminWarehousesController.php index 585e5ba3e..d3c679af0 100644 --- a/controllers/admin/AdminWarehousesController.php +++ b/controllers/admin/AdminWarehousesController.php @@ -513,7 +513,7 @@ class AdminWarehousesControllerCore extends AdminController /** * @see AdminController::afterAdd() */ - public function afterAdd($object) + protected function afterAdd($object) { $address = new Address($object->id_address); if (Validate::isLoadedObject($address))