diff options
| -rw-r--r-- | IkiWiki.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Plugin/html.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index a732be999..5bb8ea1c9 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -16,7 +16,7 @@ use vars qw{%config %links %oldlinks %oldpagemtime %pagectime %renderedfiles %pagesources %depends %hooks %forcerebuild}; sub defaultconfig () { #{{{ - wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.html?$|\.rss$)}, + wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.x?html?$|\.rss$)}, wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]]+)\]\]/, wiki_processor_regexp => qr/\[\[(\w+)\s+([^\]]*)\]\]/, wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/, diff --git a/IkiWiki/Plugin/html.pm b/IkiWiki/Plugin/html.pm index 6bf813292..cf3d4506e 100644 --- a/IkiWiki/Plugin/html.pm +++ b/IkiWiki/Plugin/html.pm @@ -12,7 +12,7 @@ sub import { #{{{ # ikiwiki defaults to skipping .html files as a security measure; # make it process them so this plugin can take effect - $IkiWiki::config{wiki_file_prune_regexp} =~ s/\|\\\.html\?\$//; + $IkiWiki::config{wiki_file_prune_regexp} =~ s/\|\\\.x?html\?\$//; } # }}} 1 diff --git a/debian/changelog b/debian/changelog index 7721dd374..02638688e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,9 @@ ikiwiki (1.16) UNRELEASED; urgency=low and blog pages. * Various CSS and formatting changes. * Encode link and guid urls in rss feeds to avoid illegal utf8 slipping in. + * Add xhtml files to the default prune regexp. - -- Joey Hess <joeyh@debian.org> Thu, 3 Aug 2006 21:36:09 -0400 + -- Joey Hess <joeyh@debian.org> Thu, 3 Aug 2006 22:35:11 -0400 ikiwiki (1.15) unstable; urgency=low |