From: intrigeri <intrigeri@boum.org>
Date: Fri, 28 Aug 2009 12:47:11 +0000 (+0200)
Subject: Revert "po: keep masterpage as the rootpage for inline's post form"
X-Git-Tag: 3.1415926~10^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=53dc18ec2b46ded088a3dca0abafb2f3c184969e;p=ikiwiki.git

Revert "po: keep masterpage as the rootpage for inline's post form"

This reverts commit cf43ae5a1f5460a98cdd7acb36c0691b2eec988f, which actually
only works when a rootpage parameter is set. A more complete fix will be
written soon.
---

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 103347c37..55c1c32c6 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -564,13 +564,9 @@ sub mybestlink ($$) {
 	my $link=shift;
 
 	my $res=$origsubs{'bestlink'}->(masterpage($page), $link);
-	my @caller = caller(1);
 	if (length $res
 	    && istranslatable($res)
-	    && istranslation($page)
-	    # keep masterpage as the rootpage for inline's post form
-	    && !(exists $caller[3] && defined $caller[3]
-		 && ($caller[3] eq "IkiWiki::rootpage"))) {
+	    && istranslation($page)) {
 		return $res . "." . lang($page);
 	}
 	return $res;