diff options
| -rw-r--r-- | IkiWiki/Plugin/osm.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | doc/style.css | 6 |
3 files changed, 8 insertions, 6 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..1b0fd18ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,10 @@ 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 + * style.css: Add compatability definitions for more block-level + html5 elements. Closes: #731199 -- Joey Hess <joeyh@debian.org> Thu, 05 Sep 2013 10:01:10 -0400 diff --git a/doc/style.css b/doc/style.css index 067a3bf7a..4c48e5c7b 100644 --- a/doc/style.css +++ b/doc/style.css @@ -5,10 +5,8 @@ */ /* html5 compat */ -article, -header, -footer, -nav { +article,aside,details,figcaption,figure, +footer,header,hgroup,menu,nav,section { display: block; } |