From: Joey Hess <joey@kitenet.net>
Date: Tue, 19 Apr 2011 21:47:40 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110430~34
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ff03d125be4df039489baea31b86ef273486d0d7?hp=e284f484da1848ae99db04873fd347396b093dde

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 434fde527..cd6fa20ba 100644
--- 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 51c426df4..ab69ba16a 100644
--- 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)