Merge pull request #8336 from defrance/patch-106

add sql log on install debug
Dolibarr · Mar 11, 2018 · d6eee30 · d6eee30
2 parents f0a0c8c + dea80eb
commit d6eee30
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
@@ -1049,7 +1049,7 @@ function _load_tables($reldir)
 					{
 						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,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 @@ function _load_tables($reldir)
 					{
 						if (preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data')
 						{
-							$result=run_sql($dir.$file,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 @@ function _load_tables($reldir)
 					{
 						if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'data')
 						{
-							$result=run_sql($dir.$file,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 @@ function _load_tables($reldir)
 					{
 						if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,6) == 'update')
 						{
-							$result=run_sql($dir.$file,1,'',1);
+							$result=run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG)?0:1, '', 1);
 							if ($result <= 0) $error++;
 						}
 					}