From ab4f5a3aea6563a323b04c399eea2d13a94645a6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 20 Oct 2017 18:15:43 +0200 Subject: [PATCH] Clean code --- htdocs/core/lib/functions.lib.php | 2 +- htdocs/societe/list.php | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 2626e917460..538c6593ff3 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2720,7 +2720,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ if (preg_match('/:[^\s0-9]/',$titlealt)) $tmparray=explode(':',$titlealt); // We explode if we have TextA:TextB. Not if we have TextA: TextB $title=$tmparray[0]; $alt=empty($tmparray[1])?'':$tmparray[1]; - return ''.dol_escape_htmltag($alt).''; // Alt is used for accessibility, title for popup + return ''.dol_escape_htmltag($alt).''; // Alt is used for accessibility, title for popup } } diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 24789902411..49c0b3db04f 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -1048,7 +1048,16 @@ while ($i < min($num, $limit)) if (! empty($arrayfields['s.nom']['checked'])) { print ''; + //if (! empty($arrayfields['s.name_alias']['checked'])) // Hide alias from output + //{ + $savalias=$companystatic->name_alias; + $companystatic->name_alias=''; + //} print $companystatic->getNomUrl(1,'',100); + //if (! empty($arrayfields['s.name_alias']['checked'])) // Hide alias from output + //{ + $companystatic->name_alias=$savalias; + //} print "\n"; if (! $i) $totalarray['nbfield']++; }