X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9c5f4761d8bf785ca98d5fda66fbbe9dbe11897c..bbfbad2da783c9b79cde861ebcd208b70dc61579:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0485da75c..720afdecd 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -39,7 +39,7 @@ sub defaultconfig () { #{{{
 	wiki_link_regexp => qr{
 		\[\[                    # beginning of link
 		(?:
-			([^\]\|]+)      # 1: link text
+			([^\]\|\n]+)    # 1: link text
 			\|              # followed by '|'
 		)?                      # optional
 		
@@ -903,7 +903,7 @@ sub template_params (@) { #{{{
 	my @ret=(
 		filter => sub {
 			my $text_ref = shift;
-			${$text_ref} = Encode::decode_utf8(${$text_ref});
+			${$text_ref} = decode_utf8(${$text_ref});
 		},
 		filename => $filename,
 		loop_context_vars => 1,