Merge pull request #12021 from frederic34/patch-14

fix broken search
This commit is contained in:
Laurent Destailleur 2019-10-03 15:57:31 +02:00 committed by GitHub
commit e59c70116f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -951,7 +951,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
{ {
$queryName = 'search_'.substr($key, 2); $queryName = 'search_'.substr($key, 2);
if (GETPOST($queryName, 'alpha')){ if (GETPOST($queryName, 'alpha')){
$search[$key]=GETPOST($queryName, 'alpha'); $search[substr($key, 2)]=GETPOST($queryName, 'alpha');
} }
} }
$search_array_options=$extrafields->getOptionalsFromPost($contactstatic->table_element, '', 'search_'); $search_array_options=$extrafields->getOptionalsFromPost($contactstatic->table_element, '', 'search_');
@ -1047,9 +1047,8 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
print '<td class="liste_titre'.($align?' '.$align:'').'">'; print '<td class="liste_titre'.($align?' '.$align:'').'">';
if (in_array($key, array('statut'))){ if (in_array($key, array('statut'))){
print $form->selectarray('search_status', array('-1'=>'','0'=>$contactstatic->LibStatut(0, 1),'1'=>$contactstatic->LibStatut(1, 1)), $search_status); print $form->selectarray('search_status', array('-1'=>'','0'=>$contactstatic->LibStatut(0, 1),'1'=>$contactstatic->LibStatut(1, 1)), $search_status);
}else{ } else {
$fieldName = substr($key, 2); print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
print sprintf('<input type="text" class="flat maxwidth75" name="search_%s" value="%s">', $fieldName, dol_escape_htmltag($search[$key]));
} }
print '</td>'; print '</td>';
} }