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

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

Browse Source 
Conflicts:
	classes/helper/HelperForm.php
	classes/helper/HelperUploader.php
This commit is contained in:
Damien Metzger
2013-10-25 18:58:07 +02:00
parent 03857c0576 8b1f9d0560
commit 39f6a2354a
14 changed files with 238 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/helper/HelperForm.php
+11 -4
View File
@@ -118,13 +118,20 @@ class HelperFormCore extends Helper
$uploader->setUrl(isset($params['url'])?$params['url']:null);
$uploader->setMultiple(isset($params['multiple'])?$params['multiple']:false);
$uploader->setUseAjax(isset($params['ajax'])?$params['ajax']:false);
$uploader->setDisplayImage(isset($params['display_image'])?$params['display_image']:false);
$uploader->setImage(isset($params['image'])?$params['image']:null);
if (isset($params['images']))
$uploader->setImages($params['images']);
elseif (isset($params['image'])) // Use for retrocompatibility
$uploader->setImages(array(
0 => array(
'image' => isset($params['image'])?$params['image']:null,
'size' => isset($params['size'])?$params['size']:null,
'delete_url' => isset($params['delete_url'])?$params['delete_url']:null
)));
$uploader->setThumb(isset($params['thumb'])?$params['thumb']:null);
$uploader->setSize(isset($params['size'])?$params['size']:null);
$uploader->setFile(isset($params['file'])?$params['file']:null);
$uploader->setTitle(isset($params['title'])?$params['title']:null);
$uploader->setDeleteUrl(isset($params['delete_url'])?$params['delete_url']:null);
$params['file'] = $uploader->render();
break;