summaryrefslogtreecommitdiff
path: root/ikiwiki
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
parentb0952742b29373bd762cf13c258cfd4559a680ad (diff)
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')
-rwxr-xr-xikiwiki6
1 files changed, 4 insertions, 2 deletions
diff --git a/ikiwiki b/ikiwiki
index 5b4972ab7..745dfddd4 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -34,7 +34,6 @@ sub getconfig () { #{{{
rebuild => 0,
refresh => 0,
getctime => 0,
- hyperestraier => 0,
wrapper => undef,
wrappermode => undef,
svnrepo => undef,
@@ -47,6 +46,7 @@ sub getconfig () { #{{{
adminuser => undef,
adminemail => undef,
plugin => [qw{inline}],
+ headercontent => '',
);
eval q{use Getopt::Long};
@@ -61,7 +61,6 @@ sub getconfig () { #{{{
"rcs=s" => \$config{rcs},
"no-rcs" => sub { $config{rcs}="" },
"anonok!" => \$config{anonok},
- "hyperestraier" => \$config{hyperestraier},
"rss!" => \$config{rss},
"cgi!" => \$config{cgi},
"notify!" => \$config{notify},
@@ -104,6 +103,9 @@ sub getconfig () { #{{{
# wrapper passes a full config structure in the environment
# variable
eval possibly_foolish_untaint($ENV{WRAPPED_OPTIONS});
+ if ($@) {
+ error("WRAPPED_OPTIONS: $@");
+ }
checkconfig();
}
} #}}}