From: intrigeri <intrigeri@boum.org>
Date: Fri, 25 Jun 2010 12:38:37 +0000 (+0200)
Subject: Merge remote branch 'upstream/master' into prv/po
X-Git-Tag: 3.20100722~8^2~8^2~17
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=9f401d6617a11efcedda1c956b2ccea061a7540f

Merge remote branch 'upstream/master' into prv/po

Conflicts:
	IkiWiki/Plugin/po.pm
---

9f401d6617a11efcedda1c956b2ccea061a7540f
diff --cc IkiWiki/Plugin/po.pm
index bbbb3b870,86d5087f4..3023fd7f9
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@@ -51,20 -51,20 +51,22 @@@ sub import 
  	hook(type => "formbuilder_setup", id => "po", call => \&formbuilder_setup, last => 1);
  	hook(type => "formbuilder", id => "po", call => \&formbuilder);
  
- 	$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);
- 	$origsubs{'urlto'}=\&IkiWiki::urlto;
- 	inject(name => "IkiWiki::urlto", call => \&myurlto);
- 	$origsubs{'cgiurl'}=\&IkiWiki::cgiurl;
- 	inject(name => "IkiWiki::cgiurl", call => \&mycgiurl);
- 	$origsubs{'rootpage'}=\&IkiWiki::rootpage;
- 	inject(name => "IkiWiki::rootpage", call => \&myrootpage);
- 	$origsubs{'isselflink'}=\&IkiWiki::isselflink;
- 	inject(name => "IkiWiki::isselflink", call => \&myisselflink);
+ 	if (! %origsubs) {
+ 		$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);
+ 		$origsubs{'urlto'}=\&IkiWiki::urlto;
+ 		inject(name => "IkiWiki::urlto", call => \&myurlto);
+ 		$origsubs{'cgiurl'}=\&IkiWiki::cgiurl;
+ 		inject(name => "IkiWiki::cgiurl", call => \&mycgiurl);
+ 		$origsubs{'rootpage'}=\&IkiWiki::rootpage;
+ 		inject(name => "IkiWiki::rootpage", call => \&myrootpage);
++		$origsubs{'isselflink'}=\&IkiWiki::isselflink;
++		inject(name => "IkiWiki::isselflink", call => \&myisselflink);
+ 	}
  }