Use a constant name starting with MAIN

This commit is contained in:
Laurent Destailleur 2018-03-11 18:06:08 +01:00 committed by GitHub
parent bfaffe6692
commit dea80eba4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1049,7 +1049,7 @@ class DolibarrModules // Can not be abstract, because we need to insta
{
if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data')
{
$result=run_sql($dir.$file, empty($conf->global->INSTALL_DISPLAY_SQL_LOG)?0:1, '', 1);
$result=run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG)?0:1, '', 1);
if ($result <= 0) $error++;
}
}
@ -1067,7 +1067,7 @@ class DolibarrModules // Can not be abstract, because we need to insta
{
if (preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data')
{
$result=run_sql($dir.$file, empty($conf->global->INSTALL_DISPLAY_SQL_LOG)?0:1, '', 1);
$result=run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG)?0:1, '', 1);
if ($result <= 0) $error++;
}
}
@ -1085,7 +1085,7 @@ class DolibarrModules // Can not be abstract, because we need to insta
{
if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'data')
{
$result=run_sql($dir.$file, empty($conf->global->INSTALL_DISPLAY_SQL_LOG)?0:1, '', 1);
$result=run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG)?0:1, '', 1);
if ($result <= 0) $error++;
}
}
@ -1103,7 +1103,7 @@ class DolibarrModules // Can not be abstract, because we need to insta
{
if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,6) == 'update')
{
$result=run_sql($dir.$file, empty($conf->global->INSTALL_DISPLAY_SQL_LOG)?0:1, '', 1);
$result=run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG)?0:1, '', 1);
if ($result <= 0) $error++;
}
}