diff options
| -rw-r--r-- | IkiWiki/Plugin/tag.pm | 3 | ||||
| -rw-r--r-- | IkiWiki/Setup/Standard.pm | 3 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/ikiwiki.setup | 3 | ||||
| -rwxr-xr-x | t/crazy-badass-perl-bug.t | 2 | ||||
| -rwxr-xr-x | t/htmlize.t | 1 |
6 files changed, 12 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm index 56bf17e2c..289b48b87 100644 --- a/IkiWiki/Plugin/tag.pm +++ b/IkiWiki/Plugin/tag.pm @@ -34,7 +34,8 @@ sub preprocess (@) { #{{{ $tags{$page} = []; foreach my $tag (keys %params) { - if (exists $IkiWiki::config{tagbase}) { + if (exists $IkiWiki::config{tagbase} && + defined $IkiWiki::config{tagbase}) { $tag=$IkiWiki::config{tagbase}."/".$tag; } push @{$tags{$page}}, $tag; diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm index 4082ca7af..b1418ae34 100644 --- a/IkiWiki/Setup/Standard.pm +++ b/IkiWiki/Setup/Standard.pm @@ -30,6 +30,9 @@ sub setup_standard { } delete $setup{disable_plugins}; } + if (exists $setup{exclude}) { + $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/; + } debug("generating wrappers.."); my @wrappers=@{$setup{wrappers}}; diff --git a/debian/changelog b/debian/changelog index 1f4cabf2d..2edb343e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ ikiwiki (1.12) UNRELEASED; urgency=low * Add getopt hook type, this allows plugins to add new command-line options. * Add --tagbase option to tag plugin. + * Add exclude option in setup files, works same as --exclude. - -- Joey Hess <joeyh@debian.org> Fri, 28 Jul 2006 01:17:48 -0400 + -- Joey Hess <joeyh@debian.org> Fri, 28 Jul 2006 13:47:34 -0400 ikiwiki (1.11) unstable; urgency=low diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup index b79722db9..8c9ce063c 100644 --- a/doc/ikiwiki.setup +++ b/doc/ikiwiki.setup @@ -67,6 +67,9 @@ use IkiWiki::Setup::Standard { #pingurl => [qw{http://rpc.technorati.com/rpc/ping}], # Include discussion links on all pages? discussion => 1, + # To exclude files matching a regexp from processing. This adds to + # the default exclude list. + #exclude => qr/\*.wav/, # Time format (for strftime) #timeformat => '%c', diff --git a/t/crazy-badass-perl-bug.t b/t/crazy-badass-perl-bug.t index f54f27c4b..047ff1db2 100755 --- a/t/crazy-badass-perl-bug.t +++ b/t/crazy-badass-perl-bug.t @@ -13,7 +13,7 @@ BEGIN { use_ok("IkiWiki::Render"); } # Initialize htmlscrubber plugin %IkiWiki::config=IkiWiki::defaultconfig(); $IkiWiki::config{srcdir}=$IkiWiki::config{destdir}="/dev/null"; -IkiWiki::checkconfig(); +IkiWiki::loadplugins(); IkiWiki::checkconfig(); ok(IkiWiki::htmlize("mdwn", IkiWiki::readfile("t/test1.mdwn"))); ok(IkiWiki::htmlize("mdwn", IkiWiki::readfile("t/test3.mdwn")), "wtf?") for 1..100; diff --git a/t/htmlize.t b/t/htmlize.t index 687eb03a8..070fbf958 100755 --- a/t/htmlize.t +++ b/t/htmlize.t @@ -10,6 +10,7 @@ BEGIN { use_ok("IkiWiki::Render"); } # Initialize htmlscrubber plugin %IkiWiki::config=IkiWiki::defaultconfig(); $IkiWiki::config{srcdir}=$IkiWiki::config{destdir}="/dev/null"; +IkiWiki::loadplugins(); IkiWiki::checkconfig(); is(IkiWiki::htmlize("mdwn", "foo\n\nbar\n"), "<p>foo</p>\n\n<p>bar</p>\n", |