* Allow disabling of plugins included in goodstuff.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index faca32835b095f7c428b3f74d0aabddc25b59d1c..2ee27ac3e7cf1fa6ac5d38a6a4917fd9eb00c770 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -129,6 +129,8 @@ sub loadplugins () { #{{{
 sub loadplugin ($) { #{{{
        my $plugin=shift;
 
+       return if grep { $_ eq $plugin} @{$config{disable_plugins}};
+
        my $mod="IkiWiki::Plugin::".possibly_foolish_untaint($plugin);
        eval qq{use $mod};
        if ($@) {

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 1e65b23e3bf5a42e5e102a2bf331b39e933b6185..0c4272286d13eace9ee24c393717b6edd93066b9 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -24,12 +24,6 @@ sub setup_standard {
                push @{$setup{plugin}}, @{$setup{add_plugins}};
                delete $setup{add_plugins};
        }
-       if (exists $setup{disable_plugins}) {
-               foreach my $plugin (@{$setup{disable_plugins}}) {
-                       $setup{plugin}=[grep { $_ ne $plugin } @{$setup{plugin}}];
-               }
-               delete $setup{disable_plugins};
-       }
        if (exists $setup{exclude}) {
                push @{$config{wiki_file_prune_regexps}}, $setup{exclude};
        }

diff --git a/debian/changelog b/debian/changelog
index 1347f194905229fa66c4d099c7f935e8713b5516..50d970bb80603333e540ff6d6bbb7cb12d39616f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,9 @@ ikiwiki (1.37) UNRELEASED; urgency=low
     is available for translation.
   * Export gettext() from IkiWiki module.
   * Don't put discussion links on discussion pages.
+  * Allow disabling of plugins included in goodstuff.
 
- -- Joey Hess <joeyh@debian.org>  Thu, 28 Dec 2006 23:40:57 -0500
+ -- Joey Hess <joeyh@debian.org>  Thu, 28 Dec 2006 23:49:11 -0500
 
 ikiwiki (1.36) unstable; urgency=low
 

diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn
index 3c51ad99efa210d43c14300850673989b7ae6363..741a8d9dc62de939e6cce0253897f59a103185e7 100644 (file)
--- a/doc/index/discussion.mdwn
+++ b/doc/index/discussion.mdwn
@@ -213,3 +213,5 @@ Ok, that's my last 2 cents for a while. --[Mazirian](http://mazirian.com)
 Some installs of PerlMagick require X11. I tried to first disable using "img" by using "--disable-plugin img"
 in the Makefile. But still failed. My workaround was to remove "img" from the bundle in IkiWiki/Plugin/goodstuff.pm
 before building. What is the recommended way to install ikiwiki without "img" support? --[[JeremyReed]]
+
+> I've fixed this in svn so plugins in goodstuff can be disabled. --[[Joey]]

diff --git a/ikiwiki.in b/ikiwiki.in
index 11d562523807ea448c73ff81898d30341804830f..c762712ba3caf1e7a62d44befef0dbb7b39c113b 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -65,7 +65,7 @@ sub getconfig () { #{{{
                                push @{$config{plugin}}, $_[1];
                        },
                        "disable-plugin=s@" => sub {
-                               $config{plugin}=[grep { $_ ne $_[1] } @{$config{plugin}}];
+                               push @{$config{disable_plugins}}, $_[1];
                        },
                        "pingurl=s" => sub {
                                push @{$config{pingurl}}, $_[1];