diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-10-08 20:33:58 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-10-08 20:33:58 -0400 |
| commit | 37ec6a82433aa1d7030bca7cae9d3813a6bdbd1f (patch) | |
| tree | 414d1d2e8d491440fb411b7d1e4b1db76ac14f15 /IkiWiki.pm | |
| parent | bc4ef28f3ebc396096b7eccad04eea6febac8d38 (diff) | |
| parent | 3bb00d142a4d31316fc6f0eb1277aa2fafe4dbe9 (diff) | |
| download | ikiwiki-37ec6a82433aa1d7030bca7cae9d3813a6bdbd1f.tar ikiwiki-37ec6a82433aa1d7030bca7cae9d3813a6bdbd1f.tar.gz | |
Merge branch 'master' into dependency-types
Conflicts:
IkiWiki.pm
IkiWiki/Render.pm
debian/changelog
Diffstat (limited to 'IkiWiki.pm')
| -rw-r--r-- | IkiWiki.pm | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index c735b26c8..daa71059b 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -38,7 +38,6 @@ our $DEPEND_LINKS=4; use Memoize; memoize("abs2rel"); memoize("pagespec_translate"); -memoize("file_pruned"); memoize("template_file"); sub getsetup () { @@ -1900,14 +1899,18 @@ sub deptype (@) { return $deptype; } -sub file_pruned ($$) { - require File::Spec; - my $file=File::Spec->canonpath(shift); - my $base=File::Spec->canonpath(shift); - $file =~ s#^\Q$base\E/+##; +sub file_pruned ($;$) { + my $file=shift; + if (@_) { + require File::Spec; + $file=File::Spec->canonpath($file); + my $base=File::Spec->canonpath(shift); + return if $file eq $base; + $file =~ s#^\Q$base\E/+##; + } my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')'; - return $file =~ m/$regexp/ && $file ne $base; + return $file =~ m/$regexp/; } sub define_gettext () { |