aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Setup
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-05-03 21:50:39 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-05-03 21:50:39 +0000
commitaf9566ff1ae55d273ff96c7ca39e34265623a55d (patch)
treebe91c4464b174b72efbd6453068e8f7308c49e02 /IkiWiki/Setup
parentb0952742b29373bd762cf13c258cfd4559a680ad (diff)
downloadikiwiki-af9566ff1ae55d273ff96c7ca39e34265623a55d.tar
ikiwiki-af9566ff1ae55d273ff96c7ca39e34265623a55d.tar.gz
rather a lot of changes to make hyperestraier search be a plugin, allowing
for other types of search engine plugins if wanted, and also opening up a lot of new possibilities for other kinds of plugins later some notable changes along the way: - lots of new hook types: cgi, render, delete - wrapper files fixed to support config strings with newlines in them - HEADERCONTENT in page template useful for plugins. Probably needs to be expanded to more such for other places plugins might want to add content. - remove unnecessary wrappers field from config info stored in wrappers
Diffstat (limited to 'IkiWiki/Setup')
-rw-r--r--IkiWiki/Setup/Standard.pm9
1 files changed, 7 insertions, 2 deletions
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 9883b922a..786ba70ac 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -21,15 +21,20 @@ sub setup_standard {
if (! $config{refresh}) {
debug("generating wrappers..");
+ my @wrappers=@{$setup{wrappers}};
+ delete $setup{wrappers};
my %startconfig=(%config);
- foreach my $wrapper (@{$setup{wrappers}}) {
+ foreach my $wrapper (@wrappers) {
%config=(%startconfig, verbose => 0, %setup, %{$wrapper});
checkconfig();
gen_wrapper();
}
%config=(%startconfig);
- delete $config{wrappers};
}
+ else {
+ delete $setup{wrappers};
+ }
+
foreach my $c (keys %setup) {
if (defined $setup{$c}) {
if (! ref $setup{$c}) {