Clean code

This commit is contained in:
Laurent Destailleur
2023-04-30 03:10:20 +02:00
parent 404940a14e
commit 382f45ec14
31 changed files with 95 additions and 63 deletions

View File

@@ -735,7 +735,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
$qualified = 1;
}
if ($qualified) {
if ($qualified && isset($user->default_values[$relativepathstring]['filters'][$defkey][$paramname])) {
// We must keep $_POST and $_GET here
if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {
// We made a search from quick search menu, do we still use default filter ?
@@ -1390,7 +1390,7 @@ function dol_string_unaccent($str)
if (utf8_check($str)) {
if (extension_loaded('intl') && !empty($conf->global->MAIN_UNACCENT_USE_TRANSLITERATOR)) {
$transliterator = \Transliterator::createFromRules(':: Any-Latin; :: Latin-ASCII; :: NFD; :: [:Nonspacing Mark:] Remove; :: NFC;', \Transliterator::FORWARD);
$transliterator = Transliterator::createFromRules(':: Any-Latin; :: Latin-ASCII; :: NFD; :: [:Nonspacing Mark:] Remove; :: NFC;', Transliterator::FORWARD);
return $transliterator->transliterate($str);
}
// See http://www.utf8-chartable.de/