diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 27c86bbae0d..4e282f6c6d8 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -126,13 +126,13 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Désactiver javascript $var=!$var; print ''.$langs->trans("DisableJavascript").''; - $html->selectyesnonum('disable_javascript',$conf->global->MAIN_DISABLE_JAVASCRIPT); + $html->selectyesnonum('disable_javascript',isset($conf->global->MAIN_DISABLE_JAVASCRIPT)?$conf->global->MAIN_DISABLE_JAVASCRIPT:0); print ''; // Désactiver ajax $var=!$var; print ''.$langs->trans("DisableAjax").''; - $html->selectyesnonum('disable_ajax',$conf->global->MAIN_DISABLE_AJAX); + $html->selectyesnonum('disable_ajax',isset($conf->global->MAIN_DISABLE_AJAX)?$conf->global->MAIN_DISABLE_AJAX:1); print ''; // Désactiver le calendrier popup diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index b10e8895f81..91b10d95b15 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -363,7 +363,7 @@ $conf->use_javascript=1; if (isset($conf->global->MAIN_DISABLE_JAVASCRIPT)) $conf->use_javascript=! $conf->global->MAIN_DISABLE_JAVASCRIPT; // conf->use_ajax -$conf->use_ajax=""; // Pas d' Ajax par defaut +$conf->use_ajax=0; // Pas d' Ajax par defaut if (isset($conf->global->MAIN_DISABLE_AJAX)) $conf->use_ajax=! $conf->global->MAIN_DISABLE_AJAX; // conf->use_popup_calendar