diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 95acc03d03aab14e8131491cf4986bab3348db37..ebf3ffe3ebb4c4082032d298b18b1e484101d492 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -1101,9 +1101,18 @@ function img_object($alt, $object) function img_picto($alt, $picto, $options='', $pictoisfullpath=0) { global $conf; + + $path = 'theme/'.$conf->theme; + + if (preg_match('/^([^@]+)@([^@]+)$/i',$picto,$regs)) + { + $picto = $regs[1]; + $path = $regs[2]; + } + if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto.='.png'; if ($pictoisfullpath) return '<img src="'.$picto.'" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'"'.($options?' '.$options:'').'>'; - return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/'.$picto.'" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'"'.($options?' '.$options:'').'>'; + return '<img src="'.DOL_URL_ROOT.'/'.$path.'/img/'.$picto.'" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'"'.($options?' '.$options:'').'>'; } /**