X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/7ea8df24b32a36687cfea94e2b84272777562325..9ae54f904af35f0c499180f27cab00d24093e62b:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index d42ceffa0..b76c87b8e 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -30,8 +30,11 @@ sub setup_standard {
 		}
 		delete $setup{disable_plugins};
 	}
+	if (exists $setup{exclude}) {
+		$config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
+	}
 
-	if (! $config{refresh}) {
+	if (! $config{refresh} || $config{wrappers}) {
 		debug("generating wrappers..");
 		my @wrappers=@{$setup{wrappers}};
 		delete $setup{wrappers};
@@ -43,9 +46,6 @@ sub setup_standard {
 		}
 		%config=(%startconfig);
 	}
-	else {
-		delete $setup{wrappers};
-	}
 	
 	foreach my $c (keys %setup) {
 		if (defined $setup{$c}) {
@@ -69,6 +69,7 @@ sub setup_standard {
 		debug("refreshing wiki..");
 	}
 
+	loadplugins();
 	checkconfig();
 	lockwiki();
 	loadindex();