X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d9b9022c13af3aa6c469df05beaa293fcf33cafc..67473ec58fbd1eebd914f2d023ee6c7a34ad47ba:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index e75175a8d..36e85d413 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -807,6 +807,7 @@ sub will_render ($$;$) { #{{{
 sub bestlink ($$) { #{{{
 	my $page=shift;
 	my $link=shift;
+	my $res=undef;
 	
 	my $cwd=$page;
 	if ($link=~s/^\/+//) {
@@ -821,25 +822,35 @@ sub bestlink ($$) { #{{{
 		$l.=$link;
 
 		if (exists $links{$l}) {
-			return $l;
+			$res=$l;
 		}
 		elsif (exists $pagecase{lc $l}) {
-			return $pagecase{lc $l};
+			$res=$pagecase{lc $l};
 		}
-	} while $cwd=~s{/?[^/]+$}{};
+	} while ($cwd=~s{/?[^/]+$}{} && ! defined $res);
 
-	if (length $config{userdir}) {
+	if (! defined $res && length $config{userdir}) {
 		my $l = "$config{userdir}/".lc($link);
 		if (exists $links{$l}) {
-			return $l;
+			$res=$l;
 		}
 		elsif (exists $pagecase{lc $l}) {
-			return $pagecase{lc $l};
+			$res=$pagecase{lc $l};
 		}
 	}
 
-	#print STDERR "warning: page $page, broken link: $link\n";
-	return "";
+	if (defined $res) {
+		run_hooks(tweakbestlink => sub {
+			$res=shift->(
+				page => $page,
+				link => $res);
+		});
+		return $res;
+	}
+	else {
+		#print STDERR "warning: page $page, broken link: $link\n";
+		return "";
+	}
 } #}}}
 
 sub isinlinableimage ($) { #{{{
@@ -927,7 +938,7 @@ sub beautify_urlpath ($) { #{{{
 		$url =~ s!/index.$config{htmlext}$!/!;
 	}
 
-	run_hooks(urlpath => sub {
+	run_hooks(tweakurlpath => sub {
 		$url=shift->(url => $url);
 	});