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

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 185d01dd68c54a3db899ee299a7a5552ba62a519..1108aeb894e658a35eff011975c1c0b50d14a439 100644 (file)
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -15,6 +15,7 @@ use IPC::Open2;
 sub import {
        hook(type => "getsetup", id => "tidy", call => \&getsetup);
        hook(type => "sanitize", id => "tidy", call => \&sanitize);
+       hook(type => "checkconfig", id => "tidy", call => \&checkconfig);
 }
 
 sub getsetup () {

diff --git a/debian/changelog b/debian/changelog
index f6ca122a00520afc7d326a28c62d92a3422581a8..45971e593eca89612f4c960b50082e22bbc2e0f5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low
   * txt: Fix display when used inside a format directive.
   * highlight: Ensure that other, more-specific format plugins,
     like txt are used in preference to this one in case of ties.
+  * htmltidy: Add missing checkconfig hook registration. Closes: #601912
 
  -- Joey Hess <joeyh@debian.org>  Mon, 25 Oct 2010 22:30:29 -0400