X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8b3d2ab0bcd5b79c30d6e07dd8f363431d94dd72..3d8d47d7858ae0e043a28f348fe8aec444d0d35a:/IkiWiki/Plugin/link.pm

diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm
index 529610710..0638d4bdd 100644
--- a/IkiWiki/Plugin/link.pm
+++ b/IkiWiki/Plugin/link.pm
@@ -8,12 +8,21 @@ use IkiWiki 2.00;
 my $link_regexp;
 
 sub import { #{{{
+	hook(type => "getsetup", id => "link", call => \&getsetup);
 	hook(type => "checkconfig", id => "link", call => \&checkconfig);
 	hook(type => "linkify", id => "link", call => \&linkify);
 	hook(type => "scan", id => "link", call => \&scan);
 	hook(type => "renamepage", id => "link", call => \&renamepage);
 } # }}}
 
+sub getsetup () { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 1,
+		},
+} #}}}
+
 sub checkconfig () { #{{{
 	if ($config{prefix_directives}) {
 		$link_regexp = qr{
@@ -60,11 +69,11 @@ sub linkify (@) { #{{{
 		defined $2
 			? ( $1 
 				? "[[$2|$3".($4 ? "#$4" : "")."]]" 
-				: htmllink($page, $destpage, IkiWiki::linkpage($3),
-					anchor => $4, linktext => IkiWiki::pagetitle($2)))
+				: htmllink($page, $destpage, linkpage($3),
+					anchor => $4, linktext => pagetitle($2)))
 			: ( $1 
 				? "[[$3".($4 ? "#$4" : "")."]]"
-				: htmllink($page, $destpage, IkiWiki::linkpage($3),
+				: htmllink($page, $destpage, linkpage($3),
 					anchor => $4))
 	}eg;
 	
@@ -77,7 +86,7 @@ sub scan (@) { #{{{
 	my $content=$params{content};
 
 	while ($content =~ /(?<!\\)$link_regexp/g) {
-		push @{$links{$page}}, IkiWiki::linkpage($2);
+		push @{$links{$page}}, linkpage($2);
 	}
 } # }}}
 
@@ -90,8 +99,9 @@ sub renamepage (@) { #{{{
 	$params{content} =~ s{(?<!\\)$link_regexp}{
 		my $linktext=$2;
 		my $link=$linktext;
-		if (bestlink($page, $2) eq $old) {
-			$link=IkiWiki::pagetitle($new, 1);
+		if (bestlink($page, linkpage($linktext)) eq $old) {
+			$link=pagetitle($new, 1);
+			$link=~s/ /_/g;
 			if ($linktext =~ m/.*\/*?[A-Z]/) {
 				# preserve leading cap of last component
 				my @bits=split("/", $link);