X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e1d456a86ff808f1bc8e73c7c5d882017bd48d89..ae980bc47108e80707b614e9ff94d1e8a836a309:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 68047b9b9..88407584f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -282,17 +282,22 @@ sub htmlpage ($) { #{{{
 	return targetpage($page, $config{htmlext});
 } #}}}
 
-sub srcfile ($) { #{{{
+sub srcfile_stat { #{{{
 	my $file=shift;
+	my $nothrow=shift;
 
-	return "$config{srcdir}/$file" if -e "$config{srcdir}/$file";
+	return "$config{srcdir}/$file", stat(_) if -e "$config{srcdir}/$file";
 	foreach my $dir (@{$config{underlaydirs}}, $config{underlaydir}) {
-		return "$dir/$file" if -e "$dir/$file";
+		return "$dir/$file", stat(_) if -e "$dir/$file";
 	}
-	error("internal error: $file cannot be found in $config{srcdir} or underlay");
+	error("internal error: $file cannot be found in $config{srcdir} or underlay") unless $nothrow;
 	return;
 } #}}}
 
+sub srcfile ($;$) { #{{{
+	return (srcfile_stat(@_))[0];
+} #}}}
+
 sub add_underlay ($) { #{{{
 	my $dir=shift;
 
@@ -1247,6 +1252,10 @@ sub pagespec_translate ($) { #{{{
 		}
 	}
 
+	if (! length $code) {
+		$code=0;
+	}
+
 	return eval 'sub { my $page=shift; '.$code.' }';
 } #}}}
 
@@ -1282,7 +1291,9 @@ use overload ( #{{{
 ); #}}}
 
 sub new { #{{{
-	return bless \$_[1], $_[0];
+	my $class = shift;
+	my $value = shift;
+	return bless \$value, $class;
 } #}}}
 
 package IkiWiki::SuccessReason;
@@ -1295,7 +1306,9 @@ use overload ( #{{{
 ); #}}}
 
 sub new { #{{{
-	return bless \$_[1], $_[0];
+	my $class = shift;
+	my $value = shift;
+	return bless \$value, $class;
 }; #}}}
 
 package IkiWiki::PageSpec;