summaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-02-12 13:02:58 -0500
committerJoey Hess <joey@gnu.kitenet.net>2009-02-12 13:04:20 -0500
commit46819b530bca5a3adf00278500a34363a94c1fb2 (patch)
tree8b93662fac45d9ce771939b3aa7df2643dd9df87 /IkiWiki
parent40cb4aa5c022eb019670ef814da2c583d9be9d1f (diff)
shortcut: If default_pageext is set, first look for shortcuts.default_pageext
Falls back to looking for shortcuts.mdwn for backwards compatabiity; there probably exist wikis that have changed the pageext but still use shortcuts.mdwn.
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/shortcut.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 0e7cbd4d1..c1e6a7eb3 100644
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -23,9 +23,13 @@ sub checkconfig () {
if (defined $config{srcdir}) {
# Preprocess the shortcuts page to get all the available shortcuts
# defined before other pages are rendered.
- my $srcfile=srcfile("shortcuts.mdwn", 1);
+ my $srcfile=srcfile("shortcuts.".$config{default_pageext}, 1);
if (! defined $srcfile) {
- error(gettext("shortcut plugin will not work without a shortcuts.mdwn"));
+ $srcfile=srcfile("shortcuts.mdwn", 1);
+ }
+ if (! defined $srcfile) {
+ error(sprintf(gettext("shortcut plugin will not work without %s"),
+ "shortcuts.".$config{default_pageext}));
}
IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));
}