urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "added the tweakbestlink hook" 

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

Signed-off-by: intrigeri <intrigeri@boum.org>
master
intrigeri 2008-11-02 17:33:32 +01:00
parent 06e3558318
commit 9643ce20d8
2 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
IkiWiki.pm
View File

@ -815,7 +815,6 @@ sub will_render ($$;$) { #{{{
sub bestlink ($$) { #{{{ sub bestlink ($$) { #{{{
my $page=shift; my $page=shift;
my $link=shift; my $link=shift;
my $res=undef;
my $cwd=$page; my $cwd=$page;
if ($link=~s/^\/+//) { if ($link=~s/^\/+//) {
@ -830,35 +829,25 @@ sub bestlink ($$) { #{{{
$l.=$link; $l.=$link;
if (exists $links{$l}) { if (exists $links{$l}) {
$res=$l; return $l;
} }
elsif (exists $pagecase{lc $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); my $l = "$config{userdir}/".lc($link);
if (exists $links{$l}) { if (exists $links{$l}) {
$res=$l; return $l;
} }
elsif (exists $pagecase{lc $l}) { elsif (exists $pagecase{lc $l}) {
$res=$pagecase{lc $l}; return $pagecase{lc $l};
} }
} }
if (defined $res) { #print STDERR "warning: page $page, broken link: $link\n";
run_hooks(tweakbestlink => sub { return "";
$res=shift->(
page => $page,
link => $res);
});
return $res;
}
else {
#print STDERR "warning: page $page, broken link: $link\n";
return "";
}
} #}}} } #}}}
sub isinlinableimage ($) { #{{{ sub isinlinableimage ($) { #{{{

11
doc/plugins/write.mdwn
View File

@ -446,17 +446,6 @@ ikiwiki; it is run just after ikiwiki has removed the trailing
It should return the modified url. 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 ## Plugin interface
To import the ikiwiki plugin interface: To import the ikiwiki plugin interface: