* Patch from hb to fix the pagestats plugin, which was broken by a past

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

diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 1f9d0a77a4c916df706358122d0973679c1b93ed..ca527ce3ca533a12ed4dc2bb3c1ae73a148383db 100644 (file)
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::shortcut;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
        hook(type => "checkconfig", id => "shortcut", call => \&checkconfig);
 
 sub import { #{{{
        hook(type => "checkconfig", id => "shortcut", call => \&checkconfig);


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

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

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


@@ -53,7 +53,7 @@ sub shortcut_expand ($$@) { #{{{
        my $text=join(" ", @params);
        my $encoded_text=$text;
        $encoded_text=~s/([^A-Za-z0-9])/sprintf("%%%02X", ord($1))/seg;
        my $text=join(" ", @params);
        my $encoded_text=$text;
        $encoded_text=~s/([^A-Za-z0-9])/sprintf("%%%02X", ord($1))/seg;

-       
+

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