From 472dabbb6002219d324ae8480df57d02b6f0ca94 Mon Sep 17 00:00:00 2001 From: joey Date: Thu, 21 Dec 2006 19:36:15 +0000 Subject: * Turn $config{wiki_file_prune_regexps} into an array that is easier to manipulate. * Only exclude rss and atom files from processing if the inline plugin is enabled and that feed type is enabled. Else it's just a copyable file type. * Move rss and atom option handling code into the inline plugin. * Applied a rather old patch from Recai to fix the "pruning is too strict" issue. Now you can have wiki source directories inside dotdirs and the like, if you want. --- ikiwiki.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'ikiwiki.in') diff --git a/ikiwiki.in b/ikiwiki.in index 7d13ab455..ad2558258 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -32,8 +32,6 @@ sub getconfig () { #{{{ "rcs=s" => \$config{rcs}, "no-rcs" => sub { $config{rcs}="" }, "anonok!" => \$config{anonok}, - "rss!" => \$config{rss}, - "atom!" => \$config{atom}, "cgi!" => \$config{cgi}, "discussion!" => \$config{discussion}, "w3mmode!" => \$config{w3mmode}, @@ -49,7 +47,7 @@ sub getconfig () { #{{{ "sslcookie!" => \$config{sslcookie}, "httpauth!" => \$config{httpauth}, "exclude=s@" => sub { - $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$_[1]/; + push @{$config{wiki_file_prune_regexp}}, $_[1]; }, "adminuser=s@" => sub { push @{$config{adminuser}}, $_[1] -- cgit v1.2.3