diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-12-21 19:36:15 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-12-21 19:36:15 +0000 |
| commit | 472dabbb6002219d324ae8480df57d02b6f0ca94 (patch) | |
| tree | d35aeb732eb885d7e1bcc2337e1cc1f452c6801b /ikiwiki.in | |
| parent | c648b2b79b2a0b19364183e700764292d0a0d521 (diff) | |
| download | ikiwiki-472dabbb6002219d324ae8480df57d02b6f0ca94.tar ikiwiki-472dabbb6002219d324ae8480df57d02b6f0ca94.tar.gz | |
* 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.
Diffstat (limited to 'ikiwiki.in')
| -rwxr-xr-x | ikiwiki.in | 4 |
1 files changed, 1 insertions, 3 deletions
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] |