X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fgeoloc%2Fcountry.tpl;h=46e2f18e1e7c5e9ebf3df34f10e42289c3738abf;hb=ecf2b474289f94932ff60ab18674610979d0e0db;hp=4aa9c2dfcfe1070262e7fdfbee83ff698b60776e;hpb=a7de4ef724d1a3b0bf978a50ce7cc9d23412c7a0;p=platal.git

diff --git a/templates/geoloc/country.tpl b/templates/geoloc/country.tpl
index 4aa9c2df..46e2f18 100644
--- a/templates/geoloc/country.tpl
+++ b/templates/geoloc/country.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2009 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -23,14 +23,14 @@
 <country id="{$smarty.request.mapid}">
   <countries>
     {foreach from=$countries item="country"}
-    <country id="{$country.id}" name="{$country.name|utf8_encode}">
+    <country id="{$country.id}" name="{$country.name}">
       <file swf="{$country.swf}" scale="{$country.scale}" xclip="{$country.xclip}" yclip="{$country.yclip}">
         <color value="{$country.color}"/>
       </file>
       {if $country.nbPop > 0 or $country.id eq 0}
       <map x="{$country.x}" y="{$country.y}" height="{$country.height}" width="{$country.width}" ratio="{$country.rat}"/>
-      <icon x="{$country.xPop}" y="{$country.yPop}" nb="{$country.nbPop}" size="{$country.rad}" name="{$country.name|utf8_encode}" green="{if $country.nbPop}{$country.yellow/$country.nbPop}{else}0{/if}" blue="0" alpha="0.7"/>
-      <moreinfos url="country?{$searchvars}mapid={$country.id}"/>
+      <icon x="{$country.xPop}" y="{$country.yPop}" nb="{$country.nbPop}" size="{$country.rad}" name="{$country.name}" green="{if $country.nbPop}{$country.yellow/$country.nbPop}{else}0{/if}" blue="0" alpha="0.7"/>
+      <moreinfos url="country{$plset_search|escape_html}mapid={$country.id}"/>
       {/if}
     </country>
     {/foreach}
@@ -39,7 +39,7 @@
     {foreach from=$cities item="city"}
     <city id="{$city.id}" name="{$city.name}">
       <icon x="{$city.x}" y="{$city.y}" nb="{$city.pop}" size="{$city.size}" name="{$city.name}" green="{if $city.pop}{$city.yellow/$city.pop}{else}0{/if}" blue="0"/>
-      <moreinfos url="city?{$searchvars}cityid={$city.id}"/>
+      <moreinfos url="city{$plset_search|escape_html}cityid={$city.id}"/>
     </city>
     {/foreach}
   </cities>