X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=inline;f=plugins%2Ffunction.display_address.php;h=02e1edc5ae4877478e3a98de80ed23a50c88be81;hb=9dd0544eb8fa39338b76e30c37022a1f76ed83eb;hp=00a6fb69d7258505b66f7d1cb9b51233deaaadfc;hpb=fde60e9f70691456b2c799c43c65126e9913791e;p=platal.git

diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php
index 00a6fb6..02e1edc 100644
--- a/plugins/function.display_address.php
+++ b/plugins/function.display_address.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -36,9 +36,8 @@ function display_address_isIdentity($idt, $value, $test_reverse = true)
     return false;
 }
 
-function smarty_function_display_address($param, &$smarty)
+function smarty_function_display_address($param, $smarty)
 {
-    require_once('geocoding.inc.php');
     $adr = $param['adr'];
     $txtad = $adr->text;
     if (!$txtad) {
@@ -101,7 +100,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);
     }