diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2015-01-22 16:05:23 +0100 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2015-01-22 16:05:23 +0100 |
| commit | 7cb3d8bf56d568a7228ec234c2ce69ed7beb6fa5 (patch) | |
| tree | 3b0638efcfd03048a4b53af9712945cfa5bdddf2 /IkiWiki/Plugin/osm.pm | |
| parent | 500f530aaecf7d3a62c9e848cda6333d47248a46 (diff) | |
| parent | 6053f36181814d44c7b72b80520146e648d9a05f (diff) | |
Conflicts (resolved manually):
IkiWiki/Plugin/img.pm
IkiWiki/Plugin/osm.pm
Diffstat (limited to 'IkiWiki/Plugin/osm.pm')
| -rw-r--r-- | IkiWiki/Plugin/osm.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm index c7078ca..e6707d4 100644 --- a/IkiWiki/Plugin/osm.pm +++ b/IkiWiki/Plugin/osm.pm @@ -534,7 +534,7 @@ sub include_javascript ($) { } } if ($loader) { - return embed_map_code($page) . "<script type=\"text/javascript\" charset=\"utf-8\">$loader</script>"; + return embed_map_code($page) . "<script type=\"text/javascript\">$loader</script>"; } else { return ''; @@ -561,7 +561,7 @@ sub cgi($) { print "<html><body>"; print "<div id=\"mapdiv-$map\"></div>"; print embed_map_code(); - print "<script type=\"text/javascript\" charset=\"utf-8\">"; + print "<script type=\"text/javascript\">"; print map_setup_code($map, $map, lat => "urlParams['lat']", lon => "urlParams['lon']", @@ -629,6 +629,7 @@ sub map_setup_code($;@) { } $options{'layers'} = $config{osm_layers}; + $name=~s/'//g; # $name comes from user input return "mapsetup('mapdiv-$name', " . to_json(\%options) . ");"; } |