Merge pull request #17642 from Givriz/dev

Compatibility phpv8
This commit is contained in:
Laurent Destailleur 2021-05-26 18:22:46 +02:00 committed by GitHub
commit 5372912b0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions

View File

@ -65,6 +65,7 @@ $arrayfields = array(
);
$arrayfields = dol_sort_array($arrayfields, 'position');
$param = '';
/*

View File

@ -68,6 +68,7 @@ $search_user = GETPOST("search_user", "alpha");
$search_desc = GETPOST("search_desc", "alpha");
$search_ua = GETPOST("search_ua", "restricthtml");
$search_prefix_session = GETPOST("search_prefix_session", "restricthtml");
$optioncss = GETPOST("optioncss", "aZ"); // Option for the css output (always '' except when 'print')
$now = dol_now();
$nowarray = dol_getdate($now);

View File

@ -949,7 +949,7 @@ if (!defined('NOLOGIN')) {
$_SESSION["dol_dst_second"] = isset($dol_dst_second) ? $dol_dst_second : '';
$_SESSION["dol_screenwidth"] = isset($dol_screenwidth) ? $dol_screenwidth : '';
$_SESSION["dol_screenheight"] = isset($dol_screenheight) ? $dol_screenheight : '';
$_SESSION["dol_company"] = $conf->global->MAIN_INFO_SOCIETE_NOM;
$_SESSION["dol_company"] = getDolGlobalString("MAIN_INFO_SOCIETE_NOM");
$_SESSION["dol_entity"] = $conf->entity;
// Store value into session (values stored only if defined)
if (!empty($dol_hide_topmenu)) {