From 41af17e06bf116d1f53a4257f2d350740cb79921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 24 Sep 2013 10:28:04 +0200 Subject: [PATCH] [-] BO: Fix data validation when iframe is allowed on some entities like CMS --- classes/controller/AdminController.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 84feddee9..1cb676e22 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -2516,12 +2516,18 @@ class AdminControllerCore extends Controller foreach ($rules['validateLang'] as $field_lang => $function) foreach ($languages as $language) if (($value = Tools::getValue($field_lang.'_'.$language['id_lang'])) !== false && !empty($value)) - if (!Validate::$function($value)) + { + if (Tools::strtolower($function) == 'iscleanhtml' && Configuration::get('PS_ALLOW_HTML_IFRAME')) + $res = Validate::$function($value, true); + else + $res = Validate::$function($value); + if (!$res) $this->errors[$field_lang.'_'.$language['id_lang']] = sprintf( Tools::displayError('The %1$s field (%2$s) is invalid.'), call_user_func(array($class_name, 'displayFieldName'), $field_lang, $class_name), $language['name'] ); + } } /**