diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index ec6e7ac5f29..8bf7f7af6a6 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -1200,8 +1200,8 @@ while ($i < min($num, $limit)) {
}
}
if (!empty($arrayfields['d.import_key']['checked'])) {
- print '
';
- print $obj->import_key;
+ print ' | ';
+ print dol_escape_htmltag($obj->import_key);
print " | \n";
if (!$i) {
$totalarray['nbfield']++;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e2bcda01b6a..7b343bcdfee 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4958,10 +4958,10 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
$liste_titre = 'liste_titre_sel';
}
- $out .= '<'.$tag.' class="'.$prefix.$liste_titre.'" '.$moreattrib;
+ $tagstart = '<'.$tag.' class="'.$prefix.$liste_titre.'" '.$moreattrib;
//$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:&;]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
- $out .= ($name && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && empty($forcenowrapcolumntitle) && !dol_textishtml($name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '';
- $out .= '>';
+ $tagstart .= ($name && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && empty($forcenowrapcolumntitle) && !dol_textishtml($name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '';
+ $tagstart .= '>';
if (empty($thead) && $field && empty($disablesortlink)) { // If this is a sort field
$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', (is_scalar($moreparam) ? $moreparam : ''));
@@ -4975,12 +4975,10 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
if ($field1 != $sortfield1) { // We are on another field than current sorted field
if (preg_match('/^DESC/i', $sortorder)) {
$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
- } else // We reverse the var $sortordertouseinlink
- {
+ } else { // We reverse the var $sortordertouseinlink
$sortordertouseinlink .= str_repeat('asc,', count(explode(',', $field)));
}
- } else // We are on field that is the first current sorting criteria
- {
+ } else { // We are on field that is the first current sorting criteria
if (preg_match('/^ASC/i', $sortorder)) { // We reverse the var $sortordertouseinlink
$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
} else {
@@ -5019,19 +5017,19 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
if (preg_match('/^DESC/', $sortorder)) {
//$out.= ''.img_down("A-Z",0).'';
//$out.= ''.img_up("Z-A",1).'';
- $sortimg .= ''.img_up("Z-A", 0, 'paddingleft').'';
+ $sortimg .= ''.img_up("Z-A", 0, 'paddingright').'';
}
if (preg_match('/^ASC/', $sortorder)) {
//$out.= ''.img_down("A-Z",1).'';
//$out.= ''.img_up("Z-A",0).'';
- $sortimg .= ''.img_down("A-Z", 0, 'paddingleft').'';
+ $sortimg .= ''.img_down("A-Z", 0, 'paddingright').'';
}
}
}
- $out .= $sortimg;
+ $tagend = ''.$tag.'>';
- $out .= ''.$tag.'>';
+ $out = $tagstart.$sortimg.$out.$tagend;
return $out;
}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 19abdd3ba9b..9eb615d2355 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -149,7 +149,8 @@ select.vmenusearchselectcombo {
background-color: unset;
}
-table.liste th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), table.liste td.wrapcolumntitle.liste_titre:not(.maxwidthsearch) {
+table.liste th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), table.liste td.wrapcolumntitle.liste_titre:not(.maxwidthsearch),
+table.liste th.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch), table.liste td.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch) {
overflow: hidden;
white-space: nowrap;
max-width: 100px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 261e89c64be..73337ba0284 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -403,7 +403,8 @@ textarea.cke_source:focus
box-shadow: none;
}
-th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), td.wrapcolumntitle.liste_titre:not(.maxwidthsearch) {
+th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), td.wrapcolumntitle.liste_titre:not(.maxwidthsearch),
+th.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch), td.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch) {
overflow: hidden;
white-space: nowrap;
max-width: 120px;