From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 16 Jul 2008 21:31:15 +0000 (-0400)
Subject: Merge commit 'intrigeri/pedigree'
X-Git-Tag: 2.54~70
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2c05a34be17c805d929f0ad563acf857eba1d46b?hp=-c

Merge commit 'intrigeri/pedigree'
---

2c05a34be17c805d929f0ad563acf857eba1d46b
diff --combined IkiWiki.pm
index 80e317110,bcbbabbe0..6a1823c5a
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@@ -77,7 -77,8 +77,8 @@@ sub defaultconfig () { #{{
  	adminuser => undef,
  	adminemail => undef,
  	plugin => [qw{mdwn link inline htmlscrubber passwordauth openid
- 			signinedit lockedit conditional recentchanges}],
+ 			signinedit lockedit conditional recentchanges
+ 			parentlinks}],
  	libdir => undef,
  	timeformat => '%c',
  	locale => undef,
@@@ -768,30 -769,21 +769,30 @@@ sub preprocess ($$$;$$) { #{{
  			}
  			my $ret;
  			if (! $scan) {
 -				$ret=$hooks{preprocess}{$command}{call}->(
 -					@params,
 -					page => $page,
 -					destpage => $destpage,
 -					preview => $preprocess_preview,
 -				);
 +				$ret=eval {
 +					$hooks{preprocess}{$command}{call}->(
 +						@params,
 +						page => $page,
 +						destpage => $destpage,
 +						preview => $preprocess_preview,
 +					);
 +				};
 +				if ($@) {
 +					chomp $@;
 +				 	$ret="[[!$command <span class=\"error\">".
 +						gettext("Error").": $@"."</span>]]";
 +				}
  			}
  			else {
  				# use void context during scan pass
 -				$hooks{preprocess}{$command}{call}->(
 -					@params,
 -					page => $page,
 -					destpage => $destpage,
 -					preview => $preprocess_preview,
 -				);
 +				eval {
 +					$hooks{preprocess}{$command}{call}->(
 +						@params,
 +						page => $page,
 +						destpage => $destpage,
 +						preview => $preprocess_preview,
 +					);
 +				};
  				$ret="";
  			}
  			$preprocessing{$page}--;