aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-12-03 12:42:04 -0400
committerJoey Hess <joey@kitenet.net>2013-12-03 12:42:04 -0400
commitbfc13b9070981ba3cd73b901af9c29a50ca0114d (patch)
tree70b3628ebcabd9f6194b99e4ac6a36bc61527f19
parent426ed67b32c625a9274d71b02a879b82a5a7ee39 (diff)
downloadikiwiki-bfc13b9070981ba3cd73b901af9c29a50ca0114d.tar
ikiwiki-bfc13b9070981ba3cd73b901af9c29a50ca0114d.tar.gz
osm: Remove invalid use of charset on embedded javascript tags. Closes: #731197
-rw-r--r--IkiWiki/Plugin/osm.pm4
-rw-r--r--debian/changelog2
2 files changed, 4 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index c9650d014..b8255bb13 100644
--- a/IkiWiki/Plugin/osm.pm
+++ b/IkiWiki/Plugin/osm.pm
@@ -507,7 +507,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 '';
@@ -534,7 +534,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']",
diff --git a/debian/changelog b/debian/changelog
index 8de229175..a984aa4f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ ikiwiki (3.20130904.2) UNRELEASED; urgency=low
rather than using the internal xapain database.
(googlesearch plugin is too hard to turn on when xapain databases
corrupt themselves, which happens all too frequently).
+ * osm: Remove invalid use of charset on embedded javascript tags.
+ Closes: #731197
-- Joey Hess <joeyh@debian.org> Thu, 05 Sep 2013 10:01:10 -0400