X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/10a2895b3b2814636050176948253d1ca9067217..3096c8ea69783b1c1cfbf5b9f940d2939d2a33f5:/IkiWiki/Plugin/shortcut.pm

diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 0e7769c67..8df60cfe2 100644
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -13,15 +13,18 @@ sub import { #{{{
 sub checkconfig () { #{{{
 	# Preprocess the shortcuts page to get all the available shortcuts
 	# defined before other pages are rendered.
-	IkiWiki::preprocess("shortcuts", "shortcuts",
-		readfile(srcfile("shortcuts.mdwn")));
+	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));
 } # }}}
 
 sub preprocess_shortcut (@) { #{{{
 	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},
@@ -59,6 +62,9 @@ sub shortcut_expand ($$@) { #{{{
 	}eg;
 
 	$text=~s/_/ /g;
+	if (defined $params{desc}) {
+		$desc=$params{desc};
+	}
 	if (defined $desc) {
 		$desc=~s/\%s/$text/g;
 	}