X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Ffunction.display_address.php;h=07ce7c3c59c043aa3d931a060dacaa4ebd798345;hb=f4ba548f2d1294a364b56cd5b89935a6c2f495d6;hp=45cbb8e535e55da0d58ca56766fe5dafaf265443;hpb=a7de4ef724d1a3b0bf978a50ce7cc9d23412c7a0;p=platal.git
diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php
index 45cbb8e..07ce7c3 100644
--- a/plugins/function.display_address.php
+++ b/plugins/function.display_address.php
@@ -1,6 +1,6 @@
";
+ $map = "";
+ if ($restore) {
+ array_unshift($lines, $idt);
+ }
if ($param['titre'])
{
if ($param['titre_div'])
- $txthtml .= "
".$param['titre'].$map."
\n";
- else
- $txthtml .= "".$param['titre']."".$map."
\n";
+ $txthtml .= "".pl_entity_decode($param['titre'])." ".$map."
\n";
+ else
+ $txthtml .= "".pl_entity_decode($param['titre'])." ".$map."
\n";
}
foreach ($lines as $line)
{
@@ -50,12 +82,12 @@ function smarty_function_display_address($param, &$smarty) {
if ($param['adr']['mobile'])
$txthtml .= "\nTél : \n".$param['adr']['mobile']."\n
\n";
if ($param['adr']['tels'] && count($param['adr']['tels'])) {
- foreach ($param['adr']['tels'] as $tel)
+ foreach ($param['adr']['tels'] as $tel)
$txthtml .= "\n".$tel['tel_type']." : \n".$tel['tel']."\n
\n";
}
- if (!$params['nodiv'])
- {
- $txthtml = "\n".$txthtml."
\n";
+ if (!$param['nodiv']) {
+ $pos = $param['pos'] ? " style='float: " . $param['pos'] . "'" : '';
+ $txthtml = "\n".$txthtml."
\n";
}
return $txthtml;
}