From 726149038130792ca162b2a9f7b84cdb2583e96c Mon Sep 17 00:00:00 2001
From: Jerome Nadaud <jerome.nadaud@prestashop.com>
Date: Thu, 28 Nov 2013 15:35:17 +0100
Subject: [PATCH] // Fix Categories image problem

---
 .../themes/default/template/helpers/uploader/simple.tpl      | 2 +-
 controllers/admin/AdminCategoriesController.php              | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/admin-dev/themes/default/template/helpers/uploader/simple.tpl b/admin-dev/themes/default/template/helpers/uploader/simple.tpl
index 8da9a642d..8d8bbd0b7 100644
--- a/admin-dev/themes/default/template/helpers/uploader/simple.tpl
+++ b/admin-dev/themes/default/template/helpers/uploader/simple.tpl
@@ -49,7 +49,7 @@
 </div>
 {else}
 <div class="form-group">
-	<div class="col-lg-12">
+	<div class="col-lg-6">
 		<input id="{$id}" type="file" name="{$name}"{if isset($multiple) && $multiple} multiple="multiple"{/if} class="hide" />
 		<div class="dummyfile input-group">
 			<span class="input-group-addon"><i class="icon-file"></i></span>
diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php
index de4877ab0..7acdccd79 100644
--- a/controllers/admin/AdminCategoriesController.php
+++ b/controllers/admin/AdminCategoriesController.php
@@ -477,9 +477,8 @@ class AdminCategoriesControllerCore extends AdminController
 					'display_image' => true,
 					'image' => $image_url ? $image_url : false,
 					'size' => $image_size,
-					'delete_url' => self::$currentIndex.'&'.$this->identifier.'='.$this->id.'&token='.$this->token.'&deleteImage=1',
+					'delete_url' => self::$currentIndex.'&'.$this->identifier.'='.$this->_category->id.'&token='.$this->token.'&deleteImage=1',
 					'hint' => $this->l('Upload a category logo from your computer.'),
-					'col' => 4
 				),
 				array(
 					'type' => 'text',
@@ -602,7 +601,7 @@ class AdminCategoriesControllerCore extends AdminController
 	{
 		if (!in_array($this->display, array('edit', 'add')))
 			$this->multishop_context_group = false;
-		if (Tools::isSubmit('forcedeleteImage') || (isset($_FILES['image']) && $_FILES['image']['size'] > 0))
+		if (Tools::isSubmit('forcedeleteImage') || (isset($_FILES['image']) && $_FILES['image']['size'] > 0) || Tools::getValue('deleteImage'))
 		{
 			$this->processForceDeleteImage();
 			if (Tools::isSubmit('forcedeleteImage'))