Merge pull request #3445 from GPCsolutions/3.7-2863

Fix #2863 Sensible defaults for ChromePHP path
This commit is contained in:
Laurent Destailleur 2015-09-03 10:32:22 +02:00
commit 6ea31d87f8

View File

@ -51,7 +51,9 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface
global $conf; global $conf;
try try
{ {
if (empty($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH)) $conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH='/usr/share/php'; if (empty($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH)) {
$conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH=DOL_DOCUMENT_ROOT . '/includes/chromephp/';
}
set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH); set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
//print 'rrrrr'.get_include_path(); //print 'rrrrr'.get_include_path();
@ -86,9 +88,9 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface
array( array(
'name' => $langs->trans('IncludePath','SYSLOG_CHROMEPHP_INCLUDEPATH'), 'name' => $langs->trans('IncludePath','SYSLOG_CHROMEPHP_INCLUDEPATH'),
'constant' => 'SYSLOG_CHROMEPHP_INCLUDEPATH', 'constant' => 'SYSLOG_CHROMEPHP_INCLUDEPATH',
'default' => '/usr/share/php', 'default' => DOL_DOCUMENT_ROOT . '/includes/chromephp/',
'attr' => 'size="60"', 'attr' => 'size="60"',
'example' => DOL_DOCUMENT_ROOT.'/includes/chromephp' 'example' =>'/usr/share/php'
) )
); );
} }