X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ecf37caff985ebb12603630564984a78deee182e..1081aa1ee5cf8b0bf64b1b0a804091b48b620c39:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 2392c787b..d2fde957c 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -455,6 +455,7 @@ sub htmllink ($$$;$$$) { #{{{
 	if (! $noimageinline && isinlinableimage($bestlink)) {
 		return "<img src=\"$bestlink\" alt=\"$linktext\" />";
 	}
+
 	return "<a href=\"$bestlink\">$linktext</a>";
 } #}}}
 
@@ -489,8 +490,9 @@ sub linkify ($$$) { #{{{
 	my $content=shift;
 
 	$content =~ s{(\\?)$config{wiki_link_regexp}}{
-		$2 ? ( $1 ? "[[$2|$3]]" : htmllink($lpage, $page, titlepage($3), 0, 0, pagetitle($2)))
-		   : ( $1 ? "[[$3]]" :    htmllink($lpage, $page, titlepage($3)))
+		defined $2
+			? ( $1 ? "[[$2|$3]]" : htmllink($lpage, $page, titlepage($3), 0, 0, pagetitle($2)))
+			: ( $1 ? "[[$3]]"    : htmllink($lpage, $page, titlepage($3)))
 	}eg;
 	
 	return $content;