From 46819b530bca5a3adf00278500a34363a94c1fb2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 12 Feb 2009 13:02:58 -0500
Subject: 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.
---
IkiWiki/Plugin/shortcut.pm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
(limited to 'IkiWiki')
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));
}
--
cgit v1.2.3