From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 5 Nov 2008 20:09:54 +0000 (-0500)
Subject: backup refs to injected subs later
X-Git-Tag: 3.15~403^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ae37bca0e2593f18ed7f6ecb129e2d5bb3c113cc;p=ikiwiki.git

backup refs to injected subs later

In case two plugins both inject replacements for these subs,
backup the ref just before injecting to make sure the most
recent version is seen.
---

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 4bac37656..466ffd0b8 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -27,9 +27,6 @@ memoize("percenttranslated");
 
 # backup references to subs that will be overriden
 my %origsubs;
-$origsubs{'bestlink'}=\&IkiWiki::bestlink;
-$origsubs{'beautify_urlpath'}=\&IkiWiki::beautify_urlpath;
-$origsubs{'targetpage'}=\&IkiWiki::targetpage;
 
 sub import { #{{{
 	hook(type => "getsetup", id => "po", call => \&getsetup);
@@ -38,8 +35,12 @@ sub import { #{{{
 	hook(type => "filter", id => "po", call => \&filter);
 	hook(type => "htmlize", id => "po", call => \&htmlize);
 	hook(type => "pagetemplate", id => "po", call => \&pagetemplate);
+
+	$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;
 	inject(name => "IkiWiki::targetpage", call => \&mytargetpage);
 } #}}}