Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0

Conflicts:
	htdocs/debugbar/class/DataCollector/DolLogsCollector.php
This commit is contained in:
Laurent Destailleur 2022-05-03 11:54:28 +02:00
commit a254412c61

View File

@ -72,7 +72,7 @@ class DolLogsCollector extends MessagesCollector
{ {
global $conf; global $conf;
$uselogfile = $conf->global->DEBUGBAR_USE_LOGFILE; $uselogfile = $conf->global->DEBUGBAR_USE_LOG_FILE;
if ($uselogfile) if ($uselogfile)
{ {