git: change calling convention of safe_git to have named arguments

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

diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 1840a5722a6300d7ce30d14cd4534ef2bc16a48d..98df143ab27e34506217f770d40c03e554dcd386 100644 (file)
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -16,6 +16,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
                plugin => {
                        safe => 1,
                        rebuild => undef,

+                       section => "widget",

                },
 }
 
                },
 }
 


@@ -72,11 +73,21 @@ sub shortcut_expand ($$@) {
        add_depends($params{destpage}, "shortcuts");
 
        my $text=join(" ", @params);
        add_depends($params{destpage}, "shortcuts");
 
        my $text=join(" ", @params);

-       my $encoded_text=$text;
-       $encoded_text=~s/([^A-Za-z0-9])/sprintf("%%%02X", ord($1))/seg;

        
        

-       $url=~s{\%([sS])}{
-               $1 eq 's' ? $encoded_text : $text
+       $url=~s{\%([sSW])}{
+               if ($1 eq 's') {
+                       my $t=$text;
+                       $t=~s/([^A-Za-z0-9])/sprintf("%%%02X", ord($1))/seg;
+                       $t;
+               }
+               elsif ($1 eq 'S') {
+                       $text;
+               }
+               elsif ($1 eq 'W') {
+                       my $t=Encode::encode_utf8($text);
+                       $t=~s/([^A-Za-z0-9])/sprintf("%%%02X", ord($1))/seg;
+                       $t;
+               }

        }eg;
 
        $text=~s/_/ /g;
        }eg;
 
        $text=~s/_/ /g;