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

Conflicts:
	htdocs/main.inc.php
This commit is contained in:
Laurent Destailleur 2021-07-21 00:41:40 +02:00
commit e02fbadcd7
3 changed files with 8 additions and 8 deletions

View File

@ -461,7 +461,7 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->gl
// Array of action code where CSRFCHECK with token will be forced (so token must be provided on url request) // Array of action code where CSRFCHECK with token will be forced (so token must be provided on url request)
$arrayofactiontoforcetokencheck = array( $arrayofactiontoforcetokencheck = array(
'activate', 'add', 'addrights', 'addtimespent', 'activate', 'add', 'addrights', 'addtimespent',
'confirm_create_user', 'confirm_create_thirdparty', 'confirm_delete', 'confirm_deletedir', 'confirm_purge', 'confirm_reject_check', 'confirm_create_user', 'confirm_create_thirdparty', 'confirm_delete', 'confirm_deletedir', 'confirm_deletefile', 'confirm_purge', 'confirm_reject_check',
'delete', 'deletefilter', 'deleteoperation', 'deleteprof', 'deletepayment', 'delrights', 'delete', 'deletefilter', 'deleteoperation', 'deleteprof', 'deletepayment', 'delrights',
'disable', 'disable',
'doprev', 'donext', 'dvprev', 'dvnext', 'doprev', 'donext', 'dvprev', 'dvnext',