summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-03-11 01:20:45 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-03-11 01:20:45 +0000
commit93bf1e4e9af4265a2f4d66ff027924ddd252b11b (patch)
tree66482e99dd812fc419d7ef2b435d8405b1f9512e
parent4a0a477e775a0795be1f8d0c1b8eb609ead34ef7 (diff)
up
-rwxr-xr-xikiwiki4
1 files changed, 2 insertions, 2 deletions
diff --git a/ikiwiki b/ikiwiki
index 6cc1b5367..cb5c68610 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -17,7 +17,7 @@ my ($srcdir, $destdir, %links, %oldlinks, %oldpagemtime, %renderedfiles,
%pagesources);
my $wiki_link_regexp=qr/\[\[([^\s]+)\]\]/;
my $wiki_file_regexp=qr/(^[-A-Za-z0-9_.:\/+]+$)/;
-my $wiki_file_prune_regexp=qr!((^|/).svn/|\.\.)!;
+my $wiki_file_prune_regexp=qr!((^|/).svn/|\.\.|^.|\/\.|\.html?$)!;
my $verbose=0;
my $wikiname="wiki";
my $default_pagetype=".mdwn";
@@ -380,7 +380,7 @@ sub refresh () {
if (/$wiki_file_prune_regexp/) {
$File::Find::prune=1;
}
- elsif (! -d $_ && ! /\.html$/ && ! /\/\./) {
+ elsif (! -d $_) {
my ($f)=/$wiki_file_regexp/; # untaint
if (! defined $f) {
warn("skipping bad filename $_\n");