From 87230795cccea6cbab29d7b59a32783b07f23a5a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Jun 2022 14:14:53 +0200 Subject: [PATCH] Fix warning --- .../comm/mailing/class/html.formadvtargetemailing.class.php | 3 ++- htdocs/comm/remx.php | 6 ++++-- htdocs/core/class/html.form.class.php | 4 +++- htdocs/core/menus/standard/eldy.lib.php | 3 ++- htdocs/main.inc.php | 3 ++- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php index f4295fa6583..9e10d51031e 100644 --- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php +++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php @@ -128,7 +128,8 @@ class FormAdvTargetEmailing extends Form $i++; } - array_multisort($label, SORT_ASC, $countryArray); + $array1_sort_order = SORT_ASC; + array_multisort($label, $array1_sort_order, $countryArray); foreach ($countryArray as $row) { $label = dol_trunc($row['label'], $maxlength, 'middle'); diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index b199cbfb162..f36b4bb0b9e 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -766,7 +766,8 @@ if ($socid > 0) { $tab_sqlobjOrder[] = $db->jdate($sqlobj->dc); } $db->free($resql2); - array_multisort($tab_sqlobjOrder, SORT_DESC, $tab_sqlobj); + $array1_sort_order = SORT_DESC; + array_multisort($tab_sqlobjOrder, $array1_sort_order, $tab_sqlobj); $num = count($tab_sqlobj); if ($num > 0) { @@ -926,7 +927,8 @@ if ($socid > 0) { $tab_sqlobjOrder[] = $db->jdate($sqlobj->dc); } $db->free($resql2); - array_multisort($tab_sqlobjOrder, SORT_DESC, $tab_sqlobj); + $array1_sort_order = SORT_DESC; + array_multisort($tab_sqlobjOrder, $array1_sort_order, $tab_sqlobj); $num = count($tab_sqlobj); if ($num > 0) { diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index dd9eabc59f6..c9b336725f5 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -920,7 +920,9 @@ class Form } if (empty($disablefavorites)) { - array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray); + $array1_sort_order = SORT_DESC; + $array2_sort_order = SORT_ASC; + array_multisort($favorite, $array1_sort_order, $label, $array2_sort_order, $countryArray); } else { $countryArray = dol_sort_array($countryArray, 'label'); } diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index d305da30907..61d9872e09f 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -879,7 +879,8 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM // foreach ($menu_array as $key => $row) { // $position[$key] = $row['position']; // } - // array_multisort($position, SORT_ASC, $menu_array); + // $array1_sort_order = SORT_ASC; + // array_multisort($position, $array1_sort_order, $menu_array); } // TODO Use the position property in menu_array to reorder the $menu_array diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 0093db5331c..d035661ba62 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -2529,7 +2529,8 @@ function printDropdownQuickadd() foreach ($items['items'] as $key => $row) { $position[$key] = $row['position']; } - array_multisort($position, SORT_ASC, $items['items']); + $array1_sort_order = SORT_ASC; + array_multisort($position, $array1_sort_order, $items['items']); } foreach ($items['items'] as $item) {