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

Revert "po: do not inject custom bestlink function when po_link_to eq default" 

This reverts commit cdc3576c8d.

Conflicts:

	IkiWiki/Plugin/po.pm

This change broke the test suite and is not strictly necessary.
master
Joey Hess 2009-08-30 14:49:53 -04:00
parent 6646841fa2
commit d678147410
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IkiWiki/Plugin/po.pm
View File

@ -51,6 +51,8 @@ sub import {
hook(type => "formbuilder_setup", id => "po", call => \&formbuilder_setup, last => 1);
hook(type => "formbuilder", id => "po", call => \&formbuilder);
$origsubs{'bestlink'}=\&IkiWiki::bestlink;
inject(name => "IkiWiki::bestlink", call => \&mybestlink);
$origsubs{'beautify_urlpath'}=\&IkiWiki::beautify_urlpath;
inject(name => "IkiWiki::beautify_urlpath", call => \&mybeautify_urlpath);
$origsubs{'targetpage'}=\&IkiWiki::targetpage;
@ -153,12 +155,6 @@ sub checkconfig () {
warn(gettext('po_link_to=negotiated requires usedirs to be enabled, falling back to po_link_to=default'));
$config{po_link_to}='default';
}
unless ($config{po_link_to} eq 'default') {
if (! exists $origsubs{'bestlink'}) {
$origsubs{'bestlink'}=\&IkiWiki::bestlink;
inject(name => "IkiWiki::bestlink", call => \&mybestlink);
}
}
push @{$config{wiki_file_prune_regexps}}, qr/\.pot$/;
@ -562,11 +558,13 @@ sub formbuilder (@) {
# `----
# Implement po_link_to 'current' and 'negotiated' settings.
# Not injected otherwise.
sub mybestlink ($$) {
my $page=shift;
my $link=shift;
return $origsubs{'bestlink'}->($page, $link)
if $config{po_link_to} eq "default";
my $res=$origsubs{'bestlink'}->(masterpage($page), $link);
my @caller = caller(1);
if (length $res

2
doc/plugins/po.mdwn
View File

@ -337,6 +337,8 @@ soon..) --[[Joey]]
> environment at the start of these parts... which I did not manage to
> achieve in the last 2 hours :/ --[[intrigeri]]
>> I've reverted it. --[[Joey]]
Documentation
-------------