From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 15 Jul 2008 00:15:08 +0000 (-0400)
Subject: Merge commit 'smcv/aggregateinternal' into aggregateinternal
X-Git-Tag: 2.54~95
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/af48316b1d3a54cde1524d47773346f4cd39cb37

Merge commit 'smcv/aggregateinternal' into aggregateinternal

Conflicts:

	IkiWiki/Plugin/aggregate.pm
---

af48316b1d3a54cde1524d47773346f4cd39cb37
diff --cc IkiWiki/Plugin/aggregate.pm
index 1f09c988b,e93492863..2fcdec9e7
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@@ -113,10 -114,17 +114,16 @@@ sub launchaggregation () { #{{
  	return 1;
  } #}}}
  
+ #  Pages with extension _aggregated have plain html markup, pass through.
+ sub htmlize (@) { #{{{
+ 	my %params=@_;
+ 	return $params{content};
+ } #}}}
+ 
 +# Used by ikiwiki-transition aggregateinternal.
  sub migrate_to_internal { #{{{
 -
  	if (! lockaggregate()) {
 -		error("an aggregation process is already running");
 -		return;
 +		error("an aggregation process is currently running");
  	}
  
  	IkiWiki::lockwiki();