Retours de PR

ATM-Consulting · Jan 15, 2025 · 0b17b94 · 0b17b94
1 parent db19e97
commit 0b17b94
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
@@ -97,7 +97,7 @@
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 /** BACKPORT PR 32662 */
-$sall = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+$search_all = GETPOST('search_all', 'alphanohtml');
 
 $fieldstosearchall = [
 	'p.label' => 'Product',
@@ -370,8 +370,8 @@
 }
 
 /** BACKPORT PR 32662 */
-if ($sall) {
-	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
 /** END BACKPORT PR 32662 */
 
@@ -423,8 +423,8 @@
 }
 
 /** BACKPORT PR 32662 */
-if ($sall != '') {
-	$param .= '&sall='.urlencode($sall);
+if ($search_all != '') {
+	$param .= '&sall='.urlencode($search_all);
 }
 /** END BACKPORT PR 32662 */
 
@@ -511,11 +511,11 @@
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contract', 0, '', '', $limit);
 
-if (!empty($sall)) {
+if (!empty($search_all)) {
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 	}
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 }
 
 $morefilter = '';