X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Ffunction.display_address.php;h=32cf19c036124fecd4777bbdb4afd7849cd5cf25;hb=f6e35ff3fefafe908e1675690340ab93265192a0;hp=c69958924e52d22817f78b3f86586ff1a0d8558c;hpb=4f35a3ca07b72943c53395ffc7ea49d493031940;p=platal.git
diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php
index c699589..32cf19c 100644
--- a/plugins/function.display_address.php
+++ b/plugins/function.display_address.php
@@ -1,6 +1,6 @@
text;
+ if (!$txtad && !$adr->phones() && !count($adr->phones())) {
return "";
}
@@ -59,9 +60,9 @@ function smarty_function_display_address($param, &$smarty)
. urlencode(implode(", ", $lines) . " ($idt)")
. "\">
";
$comment = "";
- if ($param['adr']['comment'] != "")
+ if ($adr->comment != "")
{
- $commentHtml = str_replace(array('&', '"'), array('&', '"'), $param['adr']['comment']);
+ $commentHtml = str_replace(array('&', '"'), array('&', '"'), $adr->comment);
$commentJs = str_replace(array('\\', '\''), array('\\\\', '\\\''), $commentHtml);
$comment = "![](\"images/icons/comments.gif\"")
\n";
}
- if(isset($param['adr']['tels'])) {
+ if($adr->phones() != null) {
require_once('function.display_phones.php');
- $txthtml .= smarty_function_display_phones($param['adr'],$smarty);
+ $txthtml .= smarty_function_display_phones(array('tels' => $adr->phones()),$smarty);
}
if (!$param['nodiv']) {
$pos = $param['pos'] ? " style='float: " . $param['pos'] . "'" : '';