From: intrigeri <intrigeri@boum.org>
Date: Sun, 2 Nov 2008 16:33:32 +0000 (+0100)
Subject: Revert "added the tweakbestlink hook"
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/9643ce20d8988da38f192689468075fe44709703?hp=06e3558318d332f91b23f60c3580a0ff9042a352;ds=inline

Revert "added the tweakbestlink hook"

This reverts commit e51089e11fc1093a253fc13ebfbd5d55912eba59.
The new "inject()" feature should replace this ad-hoc hook.

Signed-off-by: intrigeri <intrigeri@boum.org>
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 90fedca4f..ba1847093 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 ($) { #{{{
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index f147b0766..82b377820 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -446,17 +446,6 @@ ikiwiki; it is run just after ikiwiki has removed the trailing
 
 It should return the modified url.
 
-### tweakbestlink
-
-	hook(type => "tweakbestlink", id => "foo", call => \&tweakbestlink);
-
-This hook can be used to modify the page returned by `bestlink`. It is
-passed named parameters `page` and `link`. These are, respectively,
-the page where the link will appear and the link ikiwiki would choose
-as the best one, if no `tweakbestlink` hook was in effect.
-
-It should return the modified link.
-
 ## Plugin interface
 
 To import the ikiwiki plugin interface: