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

2013-11-07 21:49:11 +01:00
parent 9c4ee27f20 2d2445efd4
commit 42af175d22
22 changed files with 391 additions and 283 deletions
@@ -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);