* Patch from Recai to fix utf8 issues in git backend.

[git.ikiwiki.info.git] / IkiWiki / Setup / Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 9883b922a5514da91ce5d820dfe2da2bca148f06..25f038a064ac8ceab4333f0d93ba13b1203262f2 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -19,17 +19,29 @@ package IkiWiki;
 sub setup_standard {
        my %setup=%{$_[1]};
 
 sub setup_standard {
        my %setup=%{$_[1]};
 

-       if (! $config{refresh}) {
-               debug("generating wrappers..");
-               my %startconfig=(%config);
-               foreach my $wrapper (@{$setup{wrappers}}) {
-                       %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
-                       checkconfig();
-                       gen_wrapper();
+       $setup{plugin}=$config{plugin};
+       if (exists $setup{add_plugins}) {
+               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}}];

                }
                }

-               %config=(%startconfig);
-               delete $config{wrappers};
+               delete $setup{disable_plugins};

        }
        }

+
+       debug("generating wrappers..");
+       my @wrappers=@{$setup{wrappers}};
+       delete $setup{wrappers};
+       my %startconfig=(%config);
+       foreach my $wrapper (@wrappers) {
+               %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
+               checkconfig();
+               gen_wrapper();
+       }
+       %config=(%startconfig);
+       

        foreach my $c (keys %setup) {
                if (defined $setup{$c}) {
                        if (! ref $setup{$c}) {
        foreach my $c (keys %setup) {
                if (defined $setup{$c}) {
                        if (! ref $setup{$c}) {