X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/f6bd81db15340bd1bfa69e98f377099036308b7b..ce029bfe044445d3d1fc10926c2ab6b9305753e0:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 18324914b..272eb239a 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -146,12 +146,6 @@ sub genpage ($$) { #{{{
 	return $content;
 } #}}}
 
-sub mtime ($) { #{{{
-	my $file=shift;
-	
-	return (stat($file))[9];
-} #}}}
-
 sub scan ($) { #{{{
 	my $file=shift;
 
@@ -162,10 +156,6 @@ sub scan ($) { #{{{
 		my $page=pagename($file);
 		will_render($page, htmlpage($page), 1);
 
-		# Always needs to be done, since filters might add links
-		# to the content.
-		$content=filter($page, $page, $content);
-	
 		if ($config{discussion}) {
 			# Discussion links are a special case since they're
 			# not in the text of the page, but on its template.
@@ -201,7 +191,7 @@ sub render ($) { #{{{
 		will_render($page, htmlpage($page), 1);
 		return if $type=~/^_/;
 		
-		my $content=htmlize($page, $type,
+		my $content=htmlize($page, $page, $type,
 			linkify($page, $page,
 			preprocess($page, $page,
 			filter($page, $page,
@@ -220,7 +210,7 @@ sub render ($) { #{{{
 			if (link($srcfile, $config{destdir}."/".$file)) {
 				return;
 			}
-			# if hardlink fails, fall back top copying
+			# if hardlink fails, fall back to copying
 		}
 		
 		my $srcfd=readfile($srcfile, 1, 1);
@@ -283,7 +273,7 @@ sub refresh () { #{{{
 			if (file_pruned($_, $config{srcdir})) {
 				$File::Find::prune=1;
 			}
-			elsif (! -d $_ && ! -l $_) {
+			elsif (! -l $_ && ! -d _) {
 				my ($f)=/$config{wiki_file_regexp}/; # untaint
 				if (! defined $f) {
 					warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
@@ -304,7 +294,7 @@ sub refresh () { #{{{
 				if (file_pruned($_, $dir)) {
 					$File::Find::prune=1;
 				}
-				elsif (! -d $_ && ! -l $_) {
+				elsif (! -l $_ && ! -d _) {
 					my ($f)=/$config{wiki_file_regexp}/; # untaint
 					if (! defined $f) {
 						warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
@@ -314,8 +304,8 @@ sub refresh () { #{{{
 						# avoid underlaydir
 						# override attacks; see
 						# security.mdwn
-						if (! -e "$config{srcdir}/$f" && 
-						    ! -l "$config{srcdir}/$f") {
+						if (! -l "$config{srcdir}/$f" && 
+						    ! -e _) {
 						    	my $page=pagename($f);
 							if (! $exists{$page}) {
 								push @files, $f;
@@ -329,7 +319,6 @@ sub refresh () { #{{{
 	};
 
 	my (%rendered, @add, @del, @internal);
-
 	# check for added or removed pages
 	foreach my $file (@files) {
 		my $page=pagename($file);
@@ -352,7 +341,7 @@ sub refresh () { #{{{
 			}
 			$pagecase{lc $page}=$page;
 			if (! exists $pagectime{$page}) {
-				$pagectime{$page}=mtime(srcfile($file));
+				$pagectime{$page}=(srcfile_stat($file))[10];
 			}
 		}
 	}
@@ -383,16 +372,15 @@ sub refresh () { #{{{
 	my @needsbuild;
 	foreach my $file (@files) {
 		my $page=pagename($file);
-		
-		my $mtime=mtime(srcfile($file));
+		my ($srcfile, @stat)=srcfile_stat($file);
 		if (! exists $pagemtime{$page} ||
-		    $mtime > $pagemtime{$page} ||
+		    $stat[9] > $pagemtime{$page} ||
 	    	    $forcerebuild{$page}) {
-			$pagemtime{$page}=$mtime;
+			$pagemtime{$page}=$stat[9];
 			if (isinternal($page)) {
 				push @internal, $file;
 				# Preprocess internal page in scan-only mode.
-				preprocess($page, $page, readfile(srcfile($file)), 1);
+				preprocess($page, $page, readfile($srcfile), 1);
 			}
 			else {
 				push @needsbuild, $file;
@@ -516,8 +504,6 @@ sub refresh () { #{{{
 } #}}}
 
 sub commandline_render () { #{{{
-	loadplugins();
-	checkconfig();
 	lockwiki();
 	loadindex();
 	unlockwiki();
@@ -534,8 +520,8 @@ sub commandline_render () { #{{{
 	$content=filter($page, $page, $content);
 	$content=preprocess($page, $page, $content);
 	$content=linkify($page, $page, $content);
-	$content=htmlize($page, $type, $content);
-	$pagemtime{$page}=mtime($srcfile);
+	$content=htmlize($page, $page, $type, $content);
+	$pagemtime{$page}=(stat($srcfile))[9];
 
 	print genpage($page, $content);
 	exit 0;