From: intrigeri <intrigeri@boum.org>
Date: Thu, 27 Aug 2009 17:56:37 +0000 (+0200)
Subject: Merge commit 'upstream/master' into prv/po
X-Git-Tag: 3.1415926~42^2~3
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/0c032b0ccb3766c422980a0e956dacbe44cfa021?hp=5e515b493c00c70095aeb8bad1e0b7757ed943db

Merge commit 'upstream/master' into prv/po
---

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index a9517adce..88d021388 100644
--- 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")