X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/97b0c6e455f9edb99d9bd5145a8e82549ed54694..69383fb6b0820360ad54122d79a3c64909d01a9d:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index b04664e41..0e7aa9a48 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -62,8 +62,8 @@ sub genpage ($$) {
 	my $page=shift;
 	my $content=shift;
 	
-	run_hooks(postscan => sub {
-		shift->(page => $page, content => $content);
+	run_hooks(indexhtml => sub {
+		shift->(page => $page, destpage => $page, content => $content);
 	});
 
 	my $templatefile;
@@ -84,19 +84,14 @@ sub genpage ($$) {
 		$template=template('page.tmpl', 
 			blind_cache => 1);
 	}
-	my $actions=0;
 
+	my $actions=0;
 	if (length $config{cgiurl}) {
 		if (IkiWiki->can("cgi_editpage")) {
 			$template->param(editurl => cgiurl(do => "edit", page => $page));
 			$actions++;
 		}
-		if (exists $hooks{auth}) {
-			$template->param(prefsurl => cgiurl(do => "prefs"));
-			$actions++;
-		}
 	}
-		
 	if (defined $config{historyurl} && length $config{historyurl}) {
 		my $u=$config{historyurl};
 		$u=~s/\[\[file\]\]/$pagesources{$page}/g;
@@ -111,10 +106,10 @@ sub genpage ($$) {
 			$actions++;
 		}
 	}
-
 	if ($actions) {
 		$template->param(have_actions => 1);
 	}
+	templateactions($template, $page);
 
 	my @backlinks=sort { $a->{page} cmp $b->{page} } backlinks($page);
 	my ($backlinks, $more_backlinks);
@@ -136,8 +131,9 @@ sub genpage ($$) {
 		backlinks => $backlinks,
 		more_backlinks => $more_backlinks,
 		mtime => displaytime($pagemtime{$page}),
-		ctime => displaytime($pagectime{$page}),
+		ctime => displaytime($pagectime{$page}, undef, 1),
 		baseurl => baseurl($page),
+		html5 => $config{html5},
 	);
 
 	run_hooks(pagetemplate => sub {
@@ -296,12 +292,11 @@ sub find_src_files () {
 	eval q{use File::Find};
 	error($@) if $@;
 
-	my ($page, $dir, $underlay);
+	my ($page, $underlay);
 	my $helper=sub {
 		my $file=decode_utf8($_);
-
 		return if -l $file || -d _;
-		$file=~s/^\Q$dir\E\/?//;
+		$file=~s/^\Q.\/\E//;
 		return if ! length $file;
 		$page = pagename($file);
 		if (! exists $pagesources{$page} &&
@@ -313,6 +308,7 @@ sub find_src_files () {
 		my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
 		if (! defined $f) {
 			warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
+			return;
 		}
 	
 		if ($underlay) {
@@ -333,17 +329,27 @@ sub find_src_files () {
 		}
 	};
 
+	eval q{use Cwd};
+	die $@ if $@;
+	my $origdir=getcwd();
+
+	chdir($config{srcdir}) || die "chdir: $!";
 	find({
 		no_chdir => 1,
 		wanted => $helper,
-	}, $dir=$config{srcdir});
+	}, '.');
+	chdir($origdir) || die "chdir: $!";
+
 	$underlay=1;
 	foreach (@{$config{underlaydirs}}, $config{underlaydir}) {
+		chdir($_) || die "chdir: $!";
 		find({
 			no_chdir => 1,
 			wanted => $helper,
-		}, $dir=$_);
+		}, '.');
+		chdir($origdir) || die "chdir: $!";
 	};
+
 	return \@files, \%pages;
 }
 
@@ -409,7 +415,7 @@ sub find_del_files ($) {
 	my @del;
 	my @internal_del;
 
-	foreach my $page (keys %pagectime) {
+	foreach my $page (keys %pagesources) {
 		if (! $pages->{$page}) {
 			if (isinternal($page)) {
 				push @internal_del, $pagesources{$page};
@@ -445,6 +451,7 @@ sub remove_del (@) {
 		}
 	
 		delete $pagecase{lc $page};
+		$delpagesources{$page}=$pagesources{$page};
 		delete $pagesources{$page};
 	}
 }
@@ -632,7 +639,7 @@ sub render_dependent ($$$$$$$) {
 				# only consider internal files
 				# if the page explicitly depends
 				# on such files
-				my $internal_dep=$dep =~ /internal\(/;
+				my $internal_dep=$dep =~ /(?:internal|comment|comment_pending)\(/;
 
 				my $in=sub {
 					my $list=shift;
@@ -791,8 +798,8 @@ sub refresh () {
 	render_backlinks($backlinkchanged);
 	remove_unrendered();
 
-	if (@$del) {
-		run_hooks(delete => sub { shift->(@$del) });
+	if (@$del || @$internal_del) {
+		run_hooks(delete => sub { shift->(@$del, @$internal_del) });
 	}
 	if (%rendered) {
 		run_hooks(change => sub { shift->(keys %rendered) });