projects
/
ikiwiki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4a0a477
)
up
author
joey
<joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Sat, 11 Mar 2006 01:20:45 +0000
(
01:20
+0000)
committer
joey
<joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Sat, 11 Mar 2006 01:20:45 +0000
(
01:20
+0000)
ikiwiki
patch
|
blob
|
history
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");