hr

[git.ikiwiki.info.git] / IkiWiki / Plugin / shortcut.pm

diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 0e7cbd4d12f0705aa8706461c404a154ad8fbf99..0cedbe447480f7f7e01a24476c1cc40e856bccc5 100644 (file)
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -16,18 +16,25 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
+                       section => "widget",
                },
 }
 
 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));
        }
 }