Fix color and format plugins to appear in the websetup interface.

diff --git a/IkiWiki/Plugin/color.pm b/IkiWiki/Plugin/color.pm
index 20505893b5885847370a99c84c900d6032d72ef9..b9407ba28198bdce90942fcba8366f731383d6c1 100644 (file)
--- a/IkiWiki/Plugin/color.pm
+++ b/IkiWiki/Plugin/color.pm
@@ -10,6 +10,15 @@ use IkiWiki 3.00;
 sub import {
        hook(type => "preprocess", id => "color", call => \&preprocess);
        hook(type => "format",     id => "color", call => \&format);
 sub import {
        hook(type => "preprocess", id => "color", call => \&preprocess);
        hook(type => "format",     id => "color", call => \&format);

+       hook(type => "getsetup",   id => "color", call => \&getsetup);
+}
+
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },

 }
 
 sub preserve_style ($$$) {
 }
 
 sub preserve_style ($$$) {

diff --git a/IkiWiki/Plugin/format.pm b/IkiWiki/Plugin/format.pm
index 1513cbed72a67447fa8bcedd9bff1f10ce076262..c8041209fc97b7324a9938a656da012b753c6456 100644 (file)
--- a/IkiWiki/Plugin/format.pm
+++ b/IkiWiki/Plugin/format.pm
@@ -7,6 +7,15 @@ use IkiWiki 3.00;
 
 sub import {
        hook(type => "preprocess", id => "format", call => \&preprocess);
 
 sub import {
        hook(type => "preprocess", id => "format", call => \&preprocess);

+       hook(type => "getsetup",   id => "format", call => \&getsetup);
+}
+
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },

 }
 
 sub preprocess (@) {
 }
 
 sub preprocess (@) {

diff --git a/debian/changelog b/debian/changelog
index 794dec41855150ad1e0628a5fc079cf34e07fa6b..06d11aa29a044cb5cd052ea3c34f1dfcf41cfcd4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
     to otherwise locked-down sites. 
   * auto-blog.setup: Lock all pages, so only admin can post to the blog
     by default, and enable opendiscussion so others can comment.
     to otherwise locked-down sites. 
   * auto-blog.setup: Lock all pages, so only admin can post to the blog
     by default, and enable opendiscussion so others can comment.

+  * Fix color and format plugins to appear in the websetup interface.

 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500