// 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

@@ -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);
 	}

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)

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);

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);

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')) &&

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))
 		{

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)))

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))

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))

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;

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;

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))