Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-01 22:52:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
This commit is contained in:
Laurent Destailleur
2021-11-30 16:24:18 +01:00
parent 07506b523f 3de3adad74
commit a298a845f1
24 changed files with 91 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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