projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/git/platal
[platal.git]
/
plugins
/
function.display_address.php
diff --git
a/plugins/function.display_address.php
b/plugins/function.display_address.php
index
25c991e
..
07ce7c3
100644
(file)
--- a/
plugins/function.display_address.php
+++ b/
plugins/function.display_address.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-200
7
Polytechnique.org *
+ * Copyright (C) 2003-200
8
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-59,7
+59,7
@@
function smarty_function_display_address($param, &$smarty)
$txthtml = "";
$map = "<a href=\"http://maps.google.fr/?q="
$txthtml = "";
$map = "<a href=\"http://maps.google.fr/?q="
- . urlencode(
str_replace('États-Unis d\'Amérique', 'USA', implode(", ", $lines) . " ($idt)")
)
+ . urlencode(
implode(", ", $lines) . " ($idt)"
)
. "\"><img src=\"images/icons/map.gif\" alt=\"Google Maps\" title=\"Carte\"/></a>";
if ($restore) {
array_unshift($lines, $idt);
. "\"><img src=\"images/icons/map.gif\" alt=\"Google Maps\" title=\"Carte\"/></a>";
if ($restore) {
array_unshift($lines, $idt);
@@
-67,9
+67,9
@@
function smarty_function_display_address($param, &$smarty)
if ($param['titre'])
{
if ($param['titre_div'])
if ($param['titre'])
{
if ($param['titre_div'])
- $txthtml .= "<div class='titre'>".
$param['titre']
.$map."</div>\n";
+ $txthtml .= "<div class='titre'>".
pl_entity_decode($param['titre'])." "
.$map."</div>\n";
else
else
- $txthtml .= "<em>".
$param['titre']."
</em>".$map."<br />\n";
+ $txthtml .= "<em>".
pl_entity_decode($param['titre'])."
</em>".$map."<br />\n";
}
foreach ($lines as $line)
{
}
foreach ($lines as $line)
{