Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

controllers/admin/AdminCategoriesController.php

@@ -312,11 +312,6 @@ class AdminCategoriesControllerCore extends AdminController
 		}
 	}
 
-	public function ajaxProcessuploadThumbnailImages()
-	{
-		Hook::exec('actionBackOfficeCategory');
-	}
-
 	public function initProcess()
 	{
 		if (Tools::isSubmit('add'.$this->table.'root'))
@@ -616,9 +611,9 @@ class AdminCategoriesControllerCore extends AdminController
 				Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getAdminTokenLite('AdminCategories').'&conf=7');
 		}
 		
-		Hook::exec('actionBackOfficeCategoryRemoveThumbnail');
 		return parent::postProcess();
 	}
+	
 	public function processForceDeleteImage()
 	{
 		$category = $this->loadObject(true);

controllers/front/CategoryController.php

@@ -199,6 +199,10 @@ class CategoryControllerCore extends FrontController
 			// Pagination must be call after "getProducts"
 			$this->pagination($this->nbProducts);
 
+		Hook::exec('actionProductListModifier', array(
+			'nb_products' => &$this->nbProducts,
+			'cat_products' => &$this->cat_products,
+		));
 
 		foreach ($this->cat_products as &$product)
 			if ($product['id_product_attribute'] && isset($product['product_attribute_minimal_quantity']))