Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 434fde527eec42304f08e28435b103b22666f0d4..cd6fa20bab87e3d74a0480e4eefaee08bbd74e2b 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -187,7 +187,7 @@ sub preprocess (@) {
                        error gettext("script not found");
                }
                push @{$metaheaders{$page}}, scrub('<script src="'.urlto($js, $page).
-                       '"' . $defer . $async . ' type="text/javascript" />',
+                       '"' . $defer . $async . ' type="text/javascript"></script>',
                        $page, $destpage);
        }
        elsif ($key eq 'openid') {

diff --git a/debian/changelog b/debian/changelog
index 51c426df4271c3b61e266b0d1f438d3e3a99b0f4..ab69ba16a4587f3120284d9a6b22e3b025feaa7a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 ikiwiki (3.20110329) UNRELEASED; urgency=low
 
   * meta: Allow adding javascript to pages. Only when htmlscrubber is
-    disabled, naturally. (Thanks, Giuseppe Bilotta)
+    disabled, naturally. (Thanks, Giuseppe Bilotta) Closes: #623154
   * comments: Add avatar picture of comment author, using Libravatar::URL
     when available. The avatar is looked up based on the user's openid,
     or email address. (Thanks, Francois Marier)