Compatibility phpv8

This commit is contained in:
Givriz 2021-05-17 18:39:08 +02:00
parent 47c24d61fc
commit 6bbd6db84b
3 changed files with 3 additions and 3 deletions

View File

@ -277,7 +277,7 @@ if ($arrayfields['module_position']['checked']) {
}
// Fields from hook
$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
$parameters = array('arrayfields'=>$arrayfields, 'param'=>empty($param) ? '' : $param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;

View File

@ -245,7 +245,7 @@ if ($result) {
if ($limit > 0 && $limit != $conf->liste_limit) {
$param .= '&limit='.urlencode($limit);
}
if ($optioncss != '') {
if (!empty($optioncss)) {
$param .= '&optioncss='.urlencode($optioncss);
}
if ($search_code) {

View File

@ -928,7 +928,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)) {