X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Ffunction.display_address.php;h=74483c3d94e033cbae2901c207fc798d1ef15795;hb=9b42c0b551d0ce7286e5b719ab49959829e99031;hp=00a6fb69d7258505b66f7d1cb9b51233deaaadfc;hpb=fde60e9f70691456b2c799c43c65126e9913791e;p=platal.git
diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php
index 00a6fb6..74483c3 100644
--- a/plugins/function.display_address.php
+++ b/plugins/function.display_address.php
@@ -1,6 +1,6 @@
text;
if (!$txtad) {
@@ -70,6 +69,11 @@ function smarty_function_display_address($param, &$smarty)
$map = "
";
+ if ($adr->flags->hasflag('mail')) {
+ $mail = '
';
+ } else {
+ $mail = '';
+ }
$comment = "";
if ($adr->comment != "")
{
@@ -90,9 +94,9 @@ function smarty_function_display_address($param, &$smarty)
if ($param['titre'])
{
if ($param['titre_div'])
- $txthtml .= "
".pl_entity_decode($param['titre'])." ".$map.$comment."
\n";
+ $txthtml .= '' . pl_entity_decode($param['titre']) . ' ' . $map . $mail . $comment . "
\n";
else
- $txthtml .= "".pl_entity_decode($param['titre'])." ".$map.$comment."
\n";
+ $txthtml .= '' . pl_entity_decode($param['titre']) . ' ' . $map . $mail . $comment . "
\n";
}
foreach ($lines as $line)
{
@@ -101,7 +105,7 @@ function smarty_function_display_address($param, &$smarty)
if ($adr->phones() != null) {
require_once 'function.display_phones.php';
$txthtml .= smarty_function_display_phones(array('tels' => $adr->phones()),$smarty);
- } else if ($param['phones'] != null) {
+ } else if (isset($param['phones']) && count($param['phones'])) {
require_once 'function.display_phones.php';
$txthtml .= smarty_function_display_phones(array('tels' => $param['phones']),$smarty);
}
@@ -112,5 +116,5 @@ function smarty_function_display_address($param, &$smarty)
return $txthtml;
}
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
?>