formatting etc

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

diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index fb096ecbd8677d183634bfae095ec40895bfbf2c..8df60cfe2a34b5e428e1eafcae88ac9c71a3c0ed 100644 (file)
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -13,7 +13,7 @@ sub import { #{{{
 sub checkconfig () { #{{{
        # Preprocess the shortcuts page to get all the available shortcuts
        # defined before other pages are rendered.
 sub checkconfig () { #{{{
        # Preprocess the shortcuts page to get all the available shortcuts
        # defined before other pages are rendered.

-       my $srcfile=eval {srcfile("shortcuts.mdwn")};
+       my $srcfile=srcfile("shortcuts.mdwn", 1);

        if (! defined $srcfile) {
                error(gettext("shortcut plugin will not work without a shortcuts.mdwn"));
        }
        if (! defined $srcfile) {
                error(gettext("shortcut plugin will not work without a shortcuts.mdwn"));
        }


@@ -24,7 +24,7 @@ sub preprocess_shortcut (@) { #{{{
        my %params=@_;
 
        if (! defined $params{name} || ! defined $params{url}) {
        my %params=@_;
 
        if (! defined $params{name} || ! defined $params{url}) {

-               return "[[shortcut ".gettext("missing name or url parameter")."]]";
+               error gettext("missing name or url parameter");

        }
 
        hook(type => "preprocess", no_override => 1, id => $params{name},
        }
 
        hook(type => "preprocess", no_override => 1, id => $params{name},


@@ -62,6 +62,9 @@ sub shortcut_expand ($$@) { #{{{
        }eg;
 
        $text=~s/_/ /g;
        }eg;
 
        $text=~s/_/ /g;

+       if (defined $params{desc}) {
+               $desc=$params{desc};
+       }

        if (defined $desc) {
                $desc=~s/\%s/$text/g;
        }
        if (defined $desc) {
                $desc=~s/\%s/$text/g;
        }