X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/fe6b271501d4d8ae00a012d14a8814cee5e0e55d..22df49a2bf92302d4c6e25a04e9c7589a93844a9:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 9883b922a..25f038a06 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -19,17 +19,29 @@ package IkiWiki;
 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}) {