Index: /extensions/GMaps/admin/gmaps_kmlfiles_iListFiles.tpl
===================================================================
--- /extensions/GMaps/admin/gmaps_kmlfiles_iListFiles.tpl (revision 7566)
+++ /extensions/GMaps/admin/gmaps_kmlfiles_iListFiles.tpl (revision 7567)
@@ -1,5 +1,5 @@
{foreach from=$datas item=data}
-
+
{$data.name} |
{$data.file} |
Index: /extensions/GMaps/admin/gmaps_maps_iListMaps.tpl
===================================================================
--- /extensions/GMaps/admin/gmaps_maps_iListMaps.tpl (revision 7566)
+++ /extensions/GMaps/admin/gmaps_maps_iListMaps.tpl (revision 7567)
@@ -1,5 +1,5 @@
{foreach from=$datas item=data}
-
+
{$data.name} |
{$data.displayType} |
Index: /extensions/GMaps/gmaps_pip.class.inc.php
===================================================================
--- /extensions/GMaps/gmaps_pip.class.inc.php (revision 7566)
+++ /extensions/GMaps/gmaps_pip.class.inc.php (revision 7567)
@@ -117,5 +117,5 @@
$mapParams=array();
- if(preg_match_all('/\[gmaps=(?:id:(?\d+);|width:(?\d+);|height:(?\d+);|markerImg:(?.+);|kmlId:(?\d+);|kmlUrl:"(?.+)";|allowBubble:(?y|n);|kmlZoom:(?y|n);|markerVisible:(?y|n);)+\]/i',$desc,$mapParams,PREG_SET_ORDER)>0)
+ if(preg_match_all('/\[gmaps=(?:id:(?\d+);|width:(?\d+);|height:(?\d+);|markerImg:(?[a-z0-9\-\._]+);|kmlId:(?\d+);|kmlUrl:"(?.+)";|allowBubble:(?y|n);|kmlZoom:(?y|n);|markerVisible:(?y|n);)+\]/i',$desc,$mapParams,PREG_SET_ORDER)>0)
{
@@ -132,5 +132,5 @@
$desc = preg_replace(
- '/\[gmaps=(?:id:(?\d+);|width:(?\d+);|height:(?\d+);|markerImg:(?.+);|kmlId:(?\d+);|kmlUrl:"(?.+)";|allowBubble:(?y|n);|kmlZoom:(?y|n);|markerVisible:(?y|n);)+\]/i',
+ '/\[gmaps=(?:id:(?\d+);|width:(?\d+);|height:(?\d+);|markerImg:(?[a-z0-9\-\._]+);|kmlId:(?\d+);|kmlUrl:"(?.+)";|allowBubble:(?y|n);|kmlZoom:(?y|n);|markerVisible:(?y|n);)+\]/i',
"", $desc);
@@ -157,5 +157,5 @@
while($row=pwg_db_fetch_assoc($result))
{
- $mapParam['kmlUrl']=dirname($_SERVER['SCRIPT_URI']).self::KML_DIRECTORY.$row[0];
+ $mapParam['kmlUrl']=dirname($_SERVER['SCRIPT_URI']).self::KML_DIRECTORY.$row['file'];
}
}
Index: /extensions/GMaps/main.inc.php
===================================================================
--- /extensions/GMaps/main.inc.php (revision 7566)
+++ /extensions/GMaps/main.inc.php (revision 7567)
@@ -68,6 +68,6 @@
| | | . Incompatibility with ExtendedDescription
| | |
-| | |
-| | |
+| | | * mantis bug:1991
+| | | . [gmaps] markup, kmlId is not functionnal
| | |
| | |