Conflicts: htdocs/core/class/doleditor.class.php htdocs/main.inc.php htdocs/product/class/product.class.php