X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/77136538788350ad2decaa445704ba5738074736..7c173aca3e87d13fdd044cb79dac80ad83d64a38:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 90fedca4f..8b3a91114 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -815,7 +815,6 @@ sub will_render ($$;$) { #{{{
 sub bestlink ($$) { #{{{
 	my $page=shift;
 	my $link=shift;
-	my $res=undef;
 	
 	my $cwd=$page;
 	if ($link=~s/^\/+//) {
@@ -830,35 +829,25 @@ sub bestlink ($$) { #{{{
 		$l.=$link;
 
 		if (exists $links{$l}) {
-			$res=$l;
+			return $l;
 		}
 		elsif (exists $pagecase{lc $l}) {
-			$res=$pagecase{lc $l};
+			return $pagecase{lc $l};
 		}
-	} while ($cwd=~s{/?[^/]+$}{} && ! defined $res);
+	} while $cwd=~s{/?[^/]+$}{};
 
-	if (! defined $res && length $config{userdir}) {
+	if (length $config{userdir}) {
 		my $l = "$config{userdir}/".lc($link);
 		if (exists $links{$l}) {
-			$res=$l;
+			return $l;
 		}
 		elsif (exists $pagecase{lc $l}) {
-			$res=$pagecase{lc $l};
+			return $pagecase{lc $l};
 		}
 	}
 
-	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 "";
-	}
+	#print STDERR "warning: page $page, broken link: $link\n";
+	return "";
 } #}}}
 
 sub isinlinableimage ($) { #{{{
@@ -953,10 +942,6 @@ sub beautify_urlpath ($) { #{{{
 		$url =~ s!/index.$config{htmlext}$!/!;
 	}
 
-	run_hooks(tweakurlpath => sub {
-		$url=shift->(url => $url);
-	});
-
 	# Ensure url is not an empty link, and
 	# if it's relative, make that explicit to avoid colon confusion.
 	if ($url !~ /^\//) {