Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge pull request #24162 from atm-lena/17.0_FIX_textishtmlfunction

Browse Source 
FIX dol_textishtml() function
This commit is contained in:
Laurent Destailleur
2023-03-27 08:29:33 +02:00
committed by GitHub
parent cba8d1719b af945c1901
commit a0098c39ab
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/functions.lib.php
View File

@@ -7485,7 +7485,7 @@ function dol_textishtml($msg, $option = 0)
return true; return true;
} elseif (preg_match('/<\/textarea/i', $msg)) { } elseif (preg_match('/<\/textarea/i', $msg)) {
return true; return true;
} elseif (preg_match('/<(b|em|i|u)>/i', $msg)) { } elseif (preg_match('/<(b|em|i|u)(\s+[^>]+)?>/i', $msg)) {
return true; return true;
} elseif (preg_match('/<br/i', $msg)) { } elseif (preg_match('/<br/i', $msg)) {
return true; return true;
@@ -7500,7 +7500,7 @@ function dol_textishtml($msg, $option = 0)
return true; return true;
} elseif (preg_match('/<\/textarea/i', $msg)) { } elseif (preg_match('/<\/textarea/i', $msg)) {
return true; return true;
} elseif (preg_match('/<(b|em|i|u)>/i', $msg)) { } elseif (preg_match('/<(b|em|i|u)(\s+[^>]+)?>/i', $msg)) {
return true; return true;
} elseif (preg_match('/<br\/>/i', $msg)) { } elseif (preg_match('/<br\/>/i', $msg)) {
return true; return true;

3
test/phpunit/FunctionsLibTest.php
View File

@@ -580,6 +580,9 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
$input='This is a text with accent &eacute;'; $input='This is a text with accent &eacute;';
$after=dol_textishtml($input); $after=dol_textishtml($input);
$this->assertTrue($after, 'Test with a &eacute;'); $this->assertTrue($after, 'Test with a &eacute;');
$input='<i class="abc">xxx</i>';
$after=dol_textishtml($input);
$this->assertTrue($after, 'Test with i tag and class;');
// False // False
$input='xxx < br>'; $input='xxx < br>';