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

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

Browse Source
This commit is contained in:
Jérôme Nadaud
2013-07-18 18:34:18 +02:00
parent c90ba4c406 ac02e5191a
commit 54fe5dfe96
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/ObjectModel.php
+1 -2
View File
@@ -942,9 +942,8 @@ abstract class ObjectModelCore
if (!empty($value))
{
$res = true;
if (Tools::strtolower($data['validate']) == 'isCleanHtml')
if (Tools::strtolower($data['validate']) == 'iscleanhtml')
{
d('in');
if (!call_user_func(array('Validate', $data['validate']), $value, (int)Configuration::get('PS_ALLOW_HTML_IFRAME')))
$res = false;
}
controllers/admin/AdminProductsController.php
+1 -1
View File
@@ -2060,7 +2060,7 @@ class AdminProductsControllerCore extends AdminController
if ($this->isProductFieldUpdated($field) && ($value = Tools::getValue($field)))
{
$res = true;
if (Tools::strtolower($function) == 'isCleanHtml')
if (Tools::strtolower($function) == 'iscleanhtml')
{
if (!Validate::$function($value, (int)Configuration::get('PS_ALLOW_HTML_IFRAME')))
$res = false;