lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19504 from fappels/14_fix_fatal_eval

Browse Source 
FIX 14.0.4 fatal error on cron list.
This commit is contained in:
Laurent Destailleur 2021-11-30 11:31:02 +01:00 committed by GitHub
commit c6fb026b75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8082,7 +8082,7 @@ function verifCond($strRights)
//print $strRights."<br>\n"; //print $strRights."<br>\n";
$rights = true; $rights = true;
if ($strRights !== '') { if (isset($strRights) && $strRights !== '') {
$str = 'if(!('.$strRights.')) { $rights = false; }'; $str = 'if(!('.$strRights.')) { $rights = false; }';
dol_eval($str); // The dol_eval must contains all the global $xxx used into a condition dol_eval($str); // The dol_eval must contains all the global $xxx used into a condition
} }

2
htdocs/cron/list.php
View File

@ -478,7 +478,7 @@ if ($num > 0) {
if (empty($obj)) { if (empty($obj)) {
break; break;
} }
if (!verifCond($obj->test)) { if (isset($obj->test) && !verifCond($obj->test)) {
continue; // Discard line with test = false continue; // Discard line with test = false
} }