diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 50a828455ed..feead12ec7d 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -935,7 +935,7 @@ class Conf extends stdClass // conf->use_javascript_ajax $this->use_javascript_ajax = 1; if (isset($this->global->MAIN_DISABLE_JAVASCRIPT)) { - $this->use_javascript_ajax = (int) !$this->global->MAIN_DISABLE_JAVASCRIPT; + $this->use_javascript_ajax = (int) !getDolGlobalInt('MAIN_DISABLE_JAVASCRIPT'); } // If no javascript_ajax, Ajax features are disabled. if (empty($this->use_javascript_ajax)) { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 86175a54e92..bbc69f36eb4 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -15137,6 +15137,7 @@ function getNonce() global $conf; if (empty($conf->cache['nonce'])) { + include_once DOL_DOCUMENT_ROOT . '/core/lib/security.lib.php'; $conf->cache['nonce'] = dolGetRandomBytes(8); } diff --git a/htdocs/install/check.php b/htdocs/install/check.php index e60132b2d7d..acbfc392bf9 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -114,7 +114,10 @@ if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0) { // print $langs->trans("PHPVersion")." ".versiontostring(versionphparray()); } if (empty($force_install_nophpinfo)) { - print ' ('.$langs->trans("MoreInformation").')'; + print ' ('; + $conf->use_javascript_ajax = 1; // We suppose javascript is on for install process + print dolButtonToOpenUrlInDialogPopup('phpinfo', $langs->trans("MoreInformation"), $langs->trans("MoreInformation"), '/install/phpinfo.php', '', ''); + print ')'; } print "
\n";