diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 176b39ca008..91d32736cbc 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -99,7 +99,6 @@ if ($action == 'update' && $user->rights->categorie->creer) {
$object->visible = $visible;
$object->fk_parent = $parent != -1 ? $parent : 0;
-
if (empty($object->label)) {
$error++;
$action = 'edit';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 50ff91a6508..2d75d8ed90b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6335,6 +6335,8 @@ function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1,
function dol_string_onlythesehtmlattributes($stringtoclean, $allowed_attributes = array("alt", "class", "contenteditable", "data-html", "href", "id", "name", "src", "style", "target", "title"))
{
if (class_exists('DOMDocument') && !empty($stringtoclean)) {
+ $stringtoclean = ''.$stringtoclean.'';
+ var_dump($stringtoclean);
$dom = new DOMDocument();
$dom->loadHTML($stringtoclean, LIBXML_ERR_NONE|LIBXML_HTML_NOIMPLIED|LIBXML_HTML_NODEFDTD|LIBXML_NONET|LIBXML_NOWARNING|LIBXML_NOXMLDECL);
if (is_object($dom)) {
@@ -6348,7 +6350,12 @@ function dol_string_onlythesehtmlattributes($stringtoclean, $allowed_attributes
}
}
- return $dom->saveHTML();
+ $return = $dom->saveHTML();
+
+ //$return = 'aaaabbssdd
'."\naaa
aabb
";
+ $return = preg_replace('/^/', '', $return);
+ $return = preg_replace('/<\/body><\/html>$/', '', $return);
+ return $return;
} else {
return $stringtoclean;
}