Merge commit 'origin/master' into account

[platal.git] / plugins / function.display_address.php

diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php
index c699589..1b3ad0a 100644 (file)
--- a/plugins/function.display_address.php
+++ b/plugins/function.display_address.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -38,8 +38,8 @@ function display_address_isIdentity($idt, $value, $test_reverse = true)
 
 function smarty_function_display_address($param, &$smarty)
 {
-    require_once('geoloc.inc.php');
-    $txtad = get_address_text($param['adr']);
+    require_once('geocoding.inc.php');
+    $txtad = $param['adr']['text'];
     if (!$txtad && !$param['adr']['tels'] && !count($param['adr']['tels'])) {
         return "";
     }