X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=inline;f=plugins%2Ffunction.display_address.php;h=85a9210a1657e0194170f96983e3bae16bb1fc62;hb=c76545c351fae4e2298624ff9ee5bf854dc5a5b6;hp=1b3ad0aa2874a1bcf15245890255f89f7ec3f18e;hpb=fb813fb52d5ab65ca9a5b92b5cb9089523380d79;p=platal.git diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php index 1b3ad0a..85a9210 100644 --- a/plugins/function.display_address.php +++ b/plugins/function.display_address.php @@ -38,10 +38,21 @@ 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'])) { - return ""; + $adr = $param['adr']; + $txtad = $adr->text; + if (!$txtad) { + $txthtml = ''; + if ($adr->phones() && count($adr->phones())) { + require_once 'function.display_phones.php'; + $txthtml .= smarty_function_display_phones(array('tels' => $adr->phones()), $smarty); + } elseif (isset($param['phones']) && count($param['phones'])) { + require_once 'function.display_phones.php'; + $txthtml .= smarty_function_display_phones(array('tels' => $param['phones']), $smarty); + } + if (!isset($param['nodiv']) && $txthtml != '' && isset($param['pos'])) { + $txthtml = '