From: intrigeri <intrigeri@boum.org>
Date: Wed, 12 Nov 2008 17:03:14 +0000 (+0100)
Subject: po(htmlize): ignore PO files not managed by this plugin
X-Git-Tag: 3.15~335
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c440a39ba4ba6726ab67b0e1d04b064ae84f67ef;p=ikiwiki.git

po(htmlize): ignore PO files not managed by this plugin

This way, the po plugin will not appropriate PO files it is not responsible for,
and PO files existing before this plugin was enabled can coexist peacefully with
our own ones.

Signed-off-by: intrigeri <intrigeri@boum.org>
---

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 8ece342a8..1212181ca 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -262,10 +262,14 @@ sub htmlize (@) { #{{{
 
 	my $page = $params{page};
 	my $content = $params{content};
-	my $masterfile = srcfile($pagesources{masterpage($page)});
+
+	# ignore PO files this plugin did not create
+	return $content unless istranslation($page);
 
 	# force content to be htmlize'd as if it was the same type as the master page
-	return IkiWiki::htmlize($page, $page, pagetype($masterfile), $content);
+	return IkiWiki::htmlize($page, $page,
+				pagetype(srcfile($pagesources{masterpage($page)})),
+				$content);
 } #}}}
 
 sub pagetemplate (@) { #{{{