diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e31c69a6d0c..de5ddc560b2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3972,9 +3972,10 @@ function dol_textishtml($msg,$option=0)
if (preg_match('//i',$msg)) return true;
- elseif (preg_match('/<(br|div|font|img|li|span|strong|table)>/i',$msg)) return true;
- elseif (preg_match('/<(br|div|font|img|li|span|strong|table)\s+[^<>\/]*>/i',$msg)) return true;
- elseif (preg_match('/<(br|div|font|img|li|span|strong|table)\s+[^<>\/]*\/>/i',$msg)) return true;
+ elseif (preg_match('/<(br|div|font|li|span|strong|table)>/i',$msg)) return true;
+ elseif (preg_match('/<(br|div|font|li|span|strong|table)\s+[^<>\/]*>/i',$msg)) return true;
+ elseif (preg_match('/<(br|div|font|li|span|strong|table)\s+[^<>\/]*\/>/i',$msg)) return true;
+ elseif (preg_match('/<(img)\s+[^<>]*>/i',$msg)) return true; // must accept
elseif (preg_match('//i',$msg)) return true;
elseif (preg_match('/&[A-Z0-9]{1,6};/i',$msg)) return true; // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)
elseif (preg_match('/[0-9]{2,3};/i',$msg)) return true; // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 68ebd5d1703..746a41d3c96 100755
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -204,6 +204,9 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
$input='abc
';
$after=dol_textishtml($input);
$this->assertTrue($after);
+ $input='
';
+ $after=dol_textishtml($input);
+ $this->assertTrue($after,'Failure on test of img tag');
// False
$input='xxx < br>';