diff --git a/admin-dev/themes/template/scenes/form.tpl b/admin-dev/themes/template/scenes/form.tpl index b35d43cfb..0c6c6992f 100644 --- a/admin-dev/themes/template/scenes/form.tpl +++ b/admin-dev/themes/template/scenes/form.tpl @@ -1,23 +1,49 @@ +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + {extends file="helper/form/form.tpl"} + {block name="end_field_block"} {if ($input.type == "description")} -

- {$input.text} -

+

{$input.text}

{/if} {/block} + {block name="after"} - + {/block} diff --git a/tools/smarty/plugins/function.implode.php b/tools/smarty/plugins/function.implode.php index 44babfd86..b0c70d450 100644 --- a/tools/smarty/plugins/function.implode.php +++ b/tools/smarty/plugins/function.implode.php @@ -23,7 +23,7 @@ */ function smarty_function_implode($params, $template) { - if (empty($params['value'])) + if (!isset($params['value'])) { trigger_error("[plugin] implode parameter 'value' cannot be empty", E_USER_NOTICE); return;