From 3a5feb707e09dbafc5da41dee8d74ce64a43dc5a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Barrois?= <raphael.barrois@polytechnique.org>
Date: Mon, 22 Mar 2010 12:58:43 +0100
Subject: [PATCH] Fix smarty display_address for new model
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---
 plugins/function.display_address.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php
index 1b3ad0a..28c6c4f 100644
--- a/plugins/function.display_address.php
+++ b/plugins/function.display_address.php
@@ -39,8 +39,9 @@ function display_address_isIdentity($idt, $value, $test_reverse = true)
 function smarty_function_display_address($param, &$smarty)
 {
     require_once('geocoding.inc.php');
-    $txtad = $param['adr']['text'];
-    if (!$txtad && !$param['adr']['tels'] && !count($param['adr']['tels'])) {
+    $adr = $param['adr'];
+    $txtad = $adr->text;
+    if (!$txtad && !$adr->phones() && !count($adr->phones())) {
         return "";
     }
 
@@ -61,7 +62,7 @@ function smarty_function_display_address($param, &$smarty)
     $comment = "";
     if ($param['adr']['comment'] != "")
     {
-        $commentHtml = str_replace(array('&', '"'), array('&amp;', '&quot;'), $param['adr']['comment']);
+        $commentHtml = str_replace(array('&', '"'), array('&amp;', '&quot;'), $adr->comment);
         $commentJs = str_replace(array('\\', '\''), array('\\\\', '\\\''), $commentHtml);
         $comment = "<img style=\"margin-left: 5px;\" src=\"images/icons/comments.gif\""
             . " onmouseover=\"return overlib('"
@@ -86,9 +87,9 @@ function smarty_function_display_address($param, &$smarty)
     {
         $txthtml .= "<strong>".$line."</strong><br/>\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'] . "'" : '';
-- 
2.1.4