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

fix targetpage replacement to support 3 argument form 

Oddly, this hadn't caused any visible breakage. Possibly inline,
which is the only thing to use targetpage, resolves the function
to the "real" one before po gets loaded?
master
Joey Hess 2011-03-24 19:44:32 -04:00
parent f39d02583a
commit 7821965ef0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IkiWiki/Plugin/po.pm
View File

@ -624,20 +624,24 @@ sub mybeautify_urlpath ($) {
return $res;
}
sub mytargetpage ($$) {
sub mytargetpage ($$;$) {
my $page=shift;
my $ext=shift;
my $filename=shift;
if (istranslation($page) || istranslatable($page)) {
my ($masterpage, $lang) = (masterpage($page), lang($page));
if (! $config{usedirs} || $masterpage eq 'index') {
if (defined $filename) {
return $masterpage . "/" . $filename . "." . $lang . "." . $ext;
}
elsif (! $config{usedirs} || $masterpage eq 'index') {
return $masterpage . "." . $lang . "." . $ext;
}
else {
return $masterpage . "/index." . $lang . "." . $ext;
}
}
return $origsubs{'targetpage'}->($page, $ext);
return $origsubs{'targetpage'}->($page, $ext, $filename);
}
sub myurlto ($;$$) {