(no commit message)

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a876bbb445353ac254d0b872709754289106077e..2eca82e4d5e2be9026c07d949088751788808e71 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -321,7 +321,7 @@ sub getsetup () {
                default => [qr/(^|\/)\.\.(\/|$)/, qr/^\./, qr/\/\./,
                        qr/\.x?html?$/, qr/\.ikiwiki-new$/,
                        qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//,
                default => [qr/(^|\/)\.\.(\/|$)/, qr/^\./, qr/\/\./,
                        qr/\.x?html?$/, qr/\.ikiwiki-new$/,
                        qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//,

-                       qr/(^|\/)_MTN\//,
+                       qr/(^|\/)_MTN\//, qr/(^|\/)_darcs\//,

                        qr/\.dpkg-tmp$/],
                description => "regexps of source files to ignore",
                safe => 0,
                        qr/\.dpkg-tmp$/],
                description => "regexps of source files to ignore",
                safe => 0,


@@ -639,8 +639,10 @@ sub pagetype ($) {
        if ($file =~ /\.([^.]+)$/) {
                return $1 if exists $hooks{htmlize}{$1};
        }
        if ($file =~ /\.([^.]+)$/) {
                return $1 if exists $hooks{htmlize}{$1};
        }

-       elsif ($hooks{htmlize}{basename($file)}{noextension}) {
-               return basename($file);
+       my $base=basename($file);
+       if (exists $hooks{htmlize}{$base} &&
+           $hooks{htmlize}{$base}{noextension}) {
+               return $base;

        }
        return;
 }
        }
        return;
 }