From 4a1cb092baabda6182fd291dfc9810f6c8efb17e Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sun, 11 Jul 2010 11:00:43 +0200
Subject: [PATCH] Revert po vs. template kludges.

This reverts commits dcd57dd5c9f3265bb7a78a5696b90976698c43aa,
d4136aea8aa8968d2cd87b40e8d85301a3549323 and
d877b9644bcfbbfc5eaf3f7fc13cb96ecda946c9.
---
 IkiWiki.pm                 | 6 ++----
 IkiWiki/Plugin/editpage.pm | 2 +-
 IkiWiki/Plugin/inline.pm   | 4 ++--
 IkiWiki/Plugin/po.pm       | 6 ------
 IkiWiki/Plugin/sidebar.pm  | 2 +-
 IkiWiki/Render.pm          | 4 ++--
 doc/plugins/write.mdwn     | 4 +---
 7 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index f9a30a202..cd9c40795 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1403,16 +1403,14 @@ sub preprocess ($$$;$$) {
 	return $content;
 }
 
-sub filter ($$$;$) {
+sub filter ($$$) {
 	my $page=shift;
 	my $destpage=shift;
 	my $content=shift;
-	my $fullpage=shift;
-	$fullpage = 0 unless defined $fullpage;
 
 	run_hooks(filter => sub {
 		$content=shift->(page => $page, destpage => $destpage, 
-			content => $content, fullpage => $fullpage);
+			content => $content);
 	});
 
 	return $content;
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 706630203..1a04a72b5 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -187,7 +187,7 @@ sub cgi_editpage ($$) {
 		my $preview=htmlize($page, $page, $type,
 			linkify($page, $page,
 			preprocess($page, $page,
-			filter($page, $page, $content, 'fullpage'), 0, 1)));
+			filter($page, $page, $content), 0, 1)));
 		run_hooks(format => sub {
 			$preview=shift->(
 				page => $page,
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index a04dd6630..715a3d652 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -403,7 +403,7 @@ sub preprocess_inline (@) {
 					      linkify($page, $params{destpage},
 					      preprocess($page, $params{destpage},
 					      filter($page, $params{destpage},
-					      readfile(srcfile($file)), 'fullpage')));
+					      readfile(srcfile($file)))));
 				}
 				else {
 					$ret.="\n".
@@ -474,7 +474,7 @@ sub get_inline_content ($$) {
 		       linkify($page, $destpage,
 		       preprocess($page, $destpage,
 		       filter($page, $destpage,
-		       readfile(srcfile($file)), 'fullpage'))));
+		       readfile(srcfile($file))))));
 		$nested--;
 		if (isinternal($page)) {
 			# make inlined text of internal pages searchable
diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index cadc13ba1..ecfbb6f78 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -259,12 +259,6 @@ sub filter (@) {
 	my $page = $params{page};
 	my $destpage = $params{destpage};
 	my $content = $params{content};
-	my $fullpage = $params{fullpage};
-
-	unless ($fullpage) {
-		return $content;
-	}
-
 	if (istranslation($page) && ! alreadyfiltered($page, $destpage)) {
 		$content = po_to_markup($page, $content);
 		setalreadyfiltered($page, $destpage);
diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 100015cee..2d495db2c 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -89,7 +89,7 @@ sub sidebar_content ($) {
 		return IkiWiki::htmlize($sidebar_page, $page, $sidebar_type,
 		       IkiWiki::linkify($sidebar_page, $page,
 		       IkiWiki::preprocess($sidebar_page, $page,
-		       IkiWiki::filter($sidebar_page, $page, $content, 'fullpage'))));
+		       IkiWiki::filter($sidebar_page, $page, $content))));
 	}
 
 }
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 233d093ed..a653ab2da 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -232,7 +232,7 @@ sub render ($$) {
 			linkify($page, $page,
 			preprocess($page, $page,
 			filter($page, $page,
-			readfile($srcfile), 'fullpage'))));
+			readfile($srcfile)))));
 		
 		my $output=htmlpage($page);
 		writefile($output, $config{destdir}, genpage($page, $content));
@@ -837,7 +837,7 @@ sub commandline_render () {
 	my $content=readfile($srcfile);
 	my $page=pagename($file);
 	$pagesources{$page}=$file;
-	$content=filter($page, $page, $content, 'fullpage');
+	$content=filter($page, $page, $content);
 	$content=preprocess($page, $page, $content);
 	$content=linkify($page, $page, $content);
 	$content=htmlize($page, $page, $type, $content);
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 8071f323e..bb8012342 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -200,9 +200,7 @@ value is ignored.
 
 Runs on the raw source of a page, before anything else touches it, and can
 make arbitrary changes. The function is passed named parameters "page",
-"destpage", "content" and "fullpage". "fullpage" is a true value if,
-and only if, a full page's content is being filtered, e.g. as opposed
-to a directive parameter. It should return the filtered content.
+"destpage", and "content". It should return the filtered content.
 
 ### preprocess