X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Ffunction.display_address.php;h=c69958924e52d22817f78b3f86586ff1a0d8558c;hb=225b4e8076bb652982eb13c16b0f832a873c6b5e;hp=07ce7c3c59c043aa3d931a060dacaa4ebd798345;hpb=756ff73fbb0cdd01cce2eda27ba18e1cc99bd735;p=platal.git diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php index 07ce7c3..c699589 100644 --- a/plugins/function.display_address.php +++ b/plugins/function.display_address.php @@ -40,12 +40,9 @@ function smarty_function_display_address($param, &$smarty) { require_once('geoloc.inc.php'); $txtad = get_address_text($param['adr']); - if (!$txtad && - !$param['adr']['tels'] && !count($param['adr']['tels']) && - !$param['adr']['tel'] && - !$param['adr']['fax'] && - !$param['adr']['mobile']) return ""; - + if (!$txtad && !$param['adr']['tels'] && !count($param['adr']['tels'])) { + return ""; + } $lines = explode("\n", $txtad); $idt = array_shift($lines); @@ -61,29 +58,37 @@ function smarty_function_display_address($param, &$smarty) $map = ""; + $comment = ""; + if ($param['adr']['comment'] != "") + { + $commentHtml = str_replace(array('&', '"'), array('&', '"'), $param['adr']['comment']); + $commentJs = str_replace(array('\\', '\''), array('\\\\', '\\\''), $commentHtml); + $comment = ""; + } if ($restore) { array_unshift($lines, $idt); } if ($param['titre']) { if ($param['titre_div']) - $txthtml .= "