dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix merge

Browse Source
This commit is contained in:
Jerome Nadaud committed 2013-10-25 14:33:29 +02:00
1 parent 08baa71a05
commit 81482df1e5
1 file changed
+2 -1
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCategoriesController.php
+2 -1
View File
@@ -457,7 +457,8 @@ class AdminCategoriesControllerCore extends AdminController
'image' => $image_url ? $image_url : false, 'image' => $image_url ? $image_url : false,
'size' => $image_size, 'size' => $image_size,
'delete_url' => self::$currentIndex.'&'.$this->identifier.'='.$this->id.'&token='.$this->token.'&deleteImage=1', '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( array(
'type' => 'text', 'type' => 'text',