From 81482df1e5a28889c61c439210d31fd8a3143270 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Fri, 25 Oct 2013 14:33:29 +0200 Subject: [PATCH] // Fix merge --- controllers/admin/AdminCategoriesController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php index abe4b3916..b9344efa3 100644 --- a/controllers/admin/AdminCategoriesController.php +++ b/controllers/admin/AdminCategoriesController.php @@ -457,7 +457,8 @@ class AdminCategoriesControllerCore extends AdminController 'image' => $image_url ? $image_url : false, 'size' => $image_size, 'delete_url' => self::$currentIndex.'&'.$this->identifier.'='.$this->id.'&token='.$this->token.'&deleteImage=1', - 'hint' => $this->l('Upload a category logo from your computer.') + 'hint' => $this->l('Upload a category logo from your computer.'), + 'col' => 4 ), array( 'type' => 'text',