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:
commit
a254412c61
@ -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)
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user