]> sipb.mit.edu Git - ikiwiki.git/commitdiff
sipb-www / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 426ed67)
osm: Remove invalid use of charset on embedded javascript tags. Closes: #731197
authorJoey Hess <joey@kitenet.net>
Tue, 3 Dec 2013 16:42:04 +0000 (12:42 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 3 Dec 2013 16:42:04 +0000 (12:42 -0400)
IkiWiki/Plugin/osm.pm patch | blob | history
debian/changelog patch | blob | history

diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index c9650d014aa1348f9c83efb77e87c76f20620452..b8255bb135f7c3c868dad302719970f610f3723b 100644 (file)
--- 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 8de2291758d8eea7dc49001bec8e0667f0cb62f2..a984aa4f29228ca7e9706294a4a20f449e18facb 100644 (file)
--- 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
 
wiki compiler