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

Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2023-03-27 18:32:25 +02:00
parent db9498262b af99141f7a
commit ec7627572f
11 changed files with 116 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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