Merge commit 'upstream/master' into prv/po

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index a9517adce2b0ce00dad8ce4f57263a173cdc68e5..88d021388e48d712e5312dd83a88ceaeb851c315 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -547,6 +547,9 @@ 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);
        if (length $res
            && ($config{po_link_to} eq "current" || $config{po_link_to} eq "negotiated")