projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
up
[ikiwiki.git]
/
ikiwiki
diff --git
a/ikiwiki
b/ikiwiki
index 6cc1b536745bef2c34735b0a1fa024865192d48f..cb5c68610b0999b604a56b92f2881b4d2fbc814f 100755
(executable)
--- 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_.:\/+]+$)/;
%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";
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;
}
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");
my ($f)=/$wiki_file_regexp/; # untaint
if (! defined $f) {
warn("skipping bad filename $_\n");