From 7d9f509a5704ec519f21a61ea284139c8852efa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?This=20Charl=C3=A8ne?= <1179011+defrance@users.noreply.github.com> Date: Sat, 13 Aug 2022 12:14:21 +0200 Subject: [PATCH 1/3] php V8 warning --- .../core/modules/expensereport/mod_expensereport_sand.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/expensereport/mod_expensereport_sand.php b/htdocs/core/modules/expensereport/mod_expensereport_sand.php index c403aa8c228..7045fc38898 100644 --- a/htdocs/core/modules/expensereport/mod_expensereport_sand.php +++ b/htdocs/core/modules/expensereport/mod_expensereport_sand.php @@ -82,7 +82,8 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; - $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).''; + $mask=!empty($conf->global->EXPENSEREPORT_SAND_MASK)?$conf->global->EXPENSEREPORT_SAND_MASK:""; + $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).''; $texte .= '  '; @@ -128,8 +129,8 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; // We get cursor rule - $mask = $conf->global->EXPENSEREPORT_SAND_MASK; - + $mask=!empty($conf->global->EXPENSEREPORT_SAND_MASK)?$conf->global->EXPENSEREPORT_SAND_MASK:""; + if (!$mask) { $this->error = 'NotConfigured'; return 0; From 15e5f6023538ed71877f84fc1114823a8bc0ee63 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Sat, 13 Aug 2022 10:18:47 +0000 Subject: [PATCH 2/3] Fixing style errors. --- htdocs/core/modules/expensereport/mod_expensereport_sand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/expensereport/mod_expensereport_sand.php b/htdocs/core/modules/expensereport/mod_expensereport_sand.php index 7045fc38898..8adf5663b58 100644 --- a/htdocs/core/modules/expensereport/mod_expensereport_sand.php +++ b/htdocs/core/modules/expensereport/mod_expensereport_sand.php @@ -130,7 +130,7 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport // We get cursor rule $mask=!empty($conf->global->EXPENSEREPORT_SAND_MASK)?$conf->global->EXPENSEREPORT_SAND_MASK:""; - + if (!$mask) { $this->error = 'NotConfigured'; return 0; From 4edafe1d756090831805d769401fed4e542b151d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 14 Aug 2022 15:20:39 +0200 Subject: [PATCH 3/3] Update mod_expensereport_sand.php --- htdocs/core/modules/expensereport/mod_expensereport_sand.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/expensereport/mod_expensereport_sand.php b/htdocs/core/modules/expensereport/mod_expensereport_sand.php index 8adf5663b58..d14f17de067 100644 --- a/htdocs/core/modules/expensereport/mod_expensereport_sand.php +++ b/htdocs/core/modules/expensereport/mod_expensereport_sand.php @@ -82,7 +82,7 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; - $mask=!empty($conf->global->EXPENSEREPORT_SAND_MASK)?$conf->global->EXPENSEREPORT_SAND_MASK:""; + $mask = empty($conf->global->EXPENSEREPORT_SAND_MASK) ? '' : $conf->global->EXPENSEREPORT_SAND_MASK; $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).''; $texte .= '  '; @@ -129,7 +129,7 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; // We get cursor rule - $mask=!empty($conf->global->EXPENSEREPORT_SAND_MASK)?$conf->global->EXPENSEREPORT_SAND_MASK:""; + $mask = empty($conf->global->EXPENSEREPORT_SAND_MASK) ? '' : $conf->global->EXPENSEREPORT_SAND_MASK; if (!$mask) { $this->error = 'NotConfigured';