From: joey Date: Sat, 11 Mar 2006 01:20:45 +0000 (+0000) Subject: up X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/93bf1e4e9af4265a2f4d66ff027924ddd252b11b up --- 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");