diff options
| author | Joey Hess <joey@kitenet.net> | 2007-12-12 16:50:29 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2007-12-12 16:50:29 -0500 |
| commit | 10a2895b3b2814636050176948253d1ca9067217 (patch) | |
| tree | 7635fee41d0f8b0dfb993ef94bb2dd8d8bfe1a8e /IkiWiki | |
| parent | d1b02ff65982cad05df34fa217d2bd0a4d9a574b (diff) | |
| download | ikiwiki-10a2895b3b2814636050176948253d1ca9067217.tar ikiwiki-10a2895b3b2814636050176948253d1ca9067217.tar.gz | |
* shortcut: Expand %S to the raw input text, not url-encoded.
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Plugin/shortcut.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm index ca527ce3c..0e7769c67 100644 --- a/IkiWiki/Plugin/shortcut.pm +++ b/IkiWiki/Plugin/shortcut.pm @@ -53,6 +53,10 @@ sub shortcut_expand ($$@) { #{{{ 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 + }eg; $text=~s/_/ /g; if (defined $desc) { @@ -62,7 +66,6 @@ sub shortcut_expand ($$@) { #{{{ $desc=$text; } - $url=~s/\%s/$encoded_text/g; return "<a href=\"$url\">$desc</a>"; } #}}} |