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

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

Browse Source 
Conflicts:
	test/phpunit/SecurityTest.php
This commit is contained in:
Laurent Destailleur
2022-03-03 02:17:53 +01:00
parent 88944656be 246474b39b
commit 4f17f45e99
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/phpunit/SecurityTest.php
View File

@@ -918,7 +918,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
$leftmenu = 'AAA';
$conf->barcode->enabled = 1;
$result=dol_eval('$conf->barcode->enabled && preg_match(\'/^(AAA|BBB)/\',$leftmenu)', 1, 1, '1');
$result=dol_eval('$conf->currency && preg_match(\'/^(AAA|BBB)/\',$leftmenu)', 1, 1, '1');
print "result = ".$result."\n";
$this->assertTrue($result);