Compatibility phpv8
This commit is contained in:
parent
47c24d61fc
commit
6bbd6db84b
@ -277,7 +277,7 @@ if ($arrayfields['module_position']['checked']) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Fields from hook
|
// 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
|
$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
|
||||||
print $hookmanager->resPrint;
|
print $hookmanager->resPrint;
|
||||||
|
|
||||||
|
|||||||
@ -245,7 +245,7 @@ if ($result) {
|
|||||||
if ($limit > 0 && $limit != $conf->liste_limit) {
|
if ($limit > 0 && $limit != $conf->liste_limit) {
|
||||||
$param .= '&limit='.urlencode($limit);
|
$param .= '&limit='.urlencode($limit);
|
||||||
}
|
}
|
||||||
if ($optioncss != '') {
|
if (!empty($optioncss)) {
|
||||||
$param .= '&optioncss='.urlencode($optioncss);
|
$param .= '&optioncss='.urlencode($optioncss);
|
||||||
}
|
}
|
||||||
if ($search_code) {
|
if ($search_code) {
|
||||||
|
|||||||
@ -928,7 +928,7 @@ if (!defined('NOLOGIN')) {
|
|||||||
$_SESSION["dol_dst_second"] = isset($dol_dst_second) ? $dol_dst_second : '';
|
$_SESSION["dol_dst_second"] = isset($dol_dst_second) ? $dol_dst_second : '';
|
||||||
$_SESSION["dol_screenwidth"] = isset($dol_screenwidth) ? $dol_screenwidth : '';
|
$_SESSION["dol_screenwidth"] = isset($dol_screenwidth) ? $dol_screenwidth : '';
|
||||||
$_SESSION["dol_screenheight"] = isset($dol_screenheight) ? $dol_screenheight : '';
|
$_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;
|
$_SESSION["dol_entity"] = $conf->entity;
|
||||||
// Store value into session (values stored only if defined)
|
// Store value into session (values stored only if defined)
|
||||||
if (!empty($dol_hide_topmenu)) {
|
if (!empty($dol_hide_topmenu)) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user