diff options
| author | intrigeri <intrigeri@boum.org> | 2009-03-08 09:50:27 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-03-08 09:50:27 +0100 |
| commit | ae474d8e14631ff519ed7d54bb64eaa0538f56d9 (patch) | |
| tree | 09637db5faf2632b67b581cf04463fe4493584d4 /IkiWiki/Plugin/shortcut.pm | |
| parent | 0314ed459ba1c49fad9170a54cc05f1c9e9c96bf (diff) | |
| parent | 08e4472fc469c630ebef93e16a66a5a69d9cb33a (diff) | |
Merge commit 'upstream/master' into prv/po
Conflicts:
IkiWiki/Plugin/editpage.pm
debian/control
debian/copyright
doc/todo/need_global_renamepage_hook.mdwn
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'IkiWiki/Plugin/shortcut.pm')
| -rw-r--r-- | IkiWiki/Plugin/shortcut.pm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm index 0e7cbd4d1..1840a5722 100644 --- a/IkiWiki/Plugin/shortcut.pm +++ b/IkiWiki/Plugin/shortcut.pm @@ -20,14 +20,20 @@ sub getsetup () { } sub checkconfig () { - if (defined $config{srcdir}) { + if (defined $config{srcdir} && length $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) { + print STDERR sprintf(gettext("shortcut plugin will not work without %s"), + "shortcuts.".$config{default_pageext})."\n"; + } + else { + IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile)); } - IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile)); } } |