diff options
author | intrigeri <intrigeri@boum.org> | 2008-11-02 13:11:00 +0100 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2008-11-02 13:11:00 +0100 |
commit | 77136538788350ad2decaa445704ba5738074736 (patch) | |
tree | acb6ea4f00bb43e78a829b1d84a42384c7f37f50 /IkiWiki/Plugin/shortcut.pm | |
parent | fadb26bc1507f7fc2caaa873ad32c12f75c378aa (diff) | |
parent | c2684b94b27c12b5e39bfbb026163b62842a9908 (diff) |
Merge commit 'origin/master' into prv/po
Diffstat (limited to 'IkiWiki/Plugin/shortcut.pm')
-rw-r--r-- | IkiWiki/Plugin/shortcut.pm | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm index 7bfce586f..dec8afdb5 100644 --- a/IkiWiki/Plugin/shortcut.pm +++ b/IkiWiki/Plugin/shortcut.pm @@ -7,7 +7,7 @@ use IkiWiki 2.00; sub import { #{{{ hook(type => "getsetup", id => "shortcut", call => \&getsetup); - hook(type => "refresh", id => "shortcut", call => \&refresh); + hook(type => "checkconfig", id => "shortcut", call => \&checkconfig); hook(type => "preprocess", id => "shortcut", call => \&preprocess_shortcut); } #}}} @@ -19,14 +19,16 @@ sub getsetup () { #{{{ }, } #}}} -sub refresh () { #{{{ - # Preprocess the shortcuts page to get all the available shortcuts - # defined before other pages are rendered. - my $srcfile=srcfile("shortcuts.mdwn", 1); - if (! defined $srcfile) { - error(gettext("shortcut plugin will not work without a shortcuts.mdwn")); +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); + if (! defined $srcfile) { + error(gettext("shortcut plugin will not work without a shortcuts.mdwn")); + } + IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile)); } - IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile)); } # }}} sub preprocess_shortcut (@) { #{{{ @@ -37,6 +39,7 @@ sub preprocess_shortcut (@) { #{{{ } hook(type => "preprocess", no_override => 1, id => $params{name}, + shortcut => 1, call => sub { shortcut_expand($params{url}, $params{desc}, @_) }); #translators: This is used to display what shortcuts are defined. |