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 1108aeb894e658a35eff011975c1c0b50d14a439..da77e60f1cb6198278e87897522fd74b553f95e9 100644 (file)
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -41,6 +41,8 @@ sub checkconfig () {
 sub sanitize (@) {
        my %params=@_;
 
+       return $params{content} unless defined $config{htmltidy};
+
        my $pid;
        my $sigpipe=0;
        $SIG{PIPE}=sub { $sigpipe=1 };

diff --git a/debian/changelog b/debian/changelog
index 246a890803eb08460a80f9337c8289a28fcda280..87a280ed038aed378b490624f96011703d0ad8ec 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ikiwiki (3.20110125) UNRELEASED; urgency=low
 
   * editpage: Avoid inheriting internal page types.
+  * htmltidy: Avoid breaking the sidebar when websetup is running.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 01 Feb 2011 21:00:57 -0400