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

Merge branch 'develop' into fix_element_type_part_03

Browse Source
This commit is contained in:
Laurent Destailleur
2024-03-09 01:47:38 +01:00
committed by GitHub
parent defc98f471 a8444e72cd
commit f4713ad8a2
86 changed files with 545 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9957,8 +9957,7 @@ function dol_eval($s, $returnvalue = 1, $hideerrors = 1, $onlysimplestring = '1'
if ($hideerrors) {
ob_start(); // An evaluation has no reason to output data
$tmps = @eval('return '.$s.';');
$tmpo = ob_get_contents();
ob_clean(); // End of interception of data
$tmpo = ob_get_clean();
if ($tmpo) {
print 'Bad string syntax to evaluate. Some data were output when it should not when evaluating: '.$s;
}
@@ -9966,8 +9965,7 @@ function dol_eval($s, $returnvalue = 1, $hideerrors = 1, $onlysimplestring = '1'
} else {
ob_start(); // An evaluation has no reason to output data
$tmps = eval('return '.$s.';');
$tmpo = ob_get_contents();
ob_clean(); // End of interception of data
$tmpo = ob_get_clean();
if ($tmpo) {
print 'Bad string syntax to evaluate. Some data were output when it should not when evaluating: '.$s;
}