diff options
| author | intrigeri <intrigeri@boum.org> | 2008-11-02 17:33:32 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2008-11-02 17:33:32 +0100 |
| commit | 9643ce20d8988da38f192689468075fe44709703 (patch) | |
| tree | 33ef29c58073ef0fc8e6a2877e22657369f16d75 /IkiWiki.pm | |
| parent | 06e3558318d332f91b23f60c3580a0ff9042a352 (diff) | |
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>
Diffstat (limited to 'IkiWiki.pm')
| -rw-r--r-- | IkiWiki.pm | 27 |
1 files changed, 8 insertions, 19 deletions
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 ($) { #{{{ |