X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/25447bccae0439ea56da7a788482a4807c7c459d..f2529edcab749d9007c6e5d28734554aa8a28d1b:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5ce802317..235efd299 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -5,7 +5,6 @@ package IkiWiki;
 use warnings;
 use strict;
 use IkiWiki;
-use Encode;
 
 my (%backlinks, %rendered);
 our %brokenlinks;
@@ -94,7 +93,8 @@ sub genpage ($$) {
 	}
 	if (defined $config{historyurl} && length $config{historyurl}) {
 		my $u=$config{historyurl};
-		$u=~s/\[\[file\]\]/$pagesources{$page}/g;
+		my $p=uri_escape_utf8($pagesources{$page}, '^A-Za-z0-9\-\._~/');
+		$u=~s/\[\[file\]\]/$p/g;
 		$template->param(historyurl => $u);
 		$actions++;
 	}
@@ -174,23 +174,15 @@ sub scan ($) {
 		}
 		delete $typedlinks{$page};
 
-		run_hooks(scan => sub {
-			shift->(
-				page => $page,
-				content => $content,
-			);
-		});
-
 		# Preprocess in scan-only mode.
 		preprocess($page, $page, $content, 1);
 
-		run_hooks(rescan => sub {
+		run_hooks(scan => sub {
 			shift->(
 				page => $page,
 				content => $content,
 			);
 		});
-
 	}
 	else {
 		will_render($file, $file, 1);
@@ -483,8 +475,18 @@ sub find_changed ($) {
 			$pagemtime{$page}=$stat[9];
 
 			if (isinternal($page)) {
+				my $content = readfile($srcfile);
+
 				# Preprocess internal page in scan-only mode.
-				preprocess($page, $page, readfile($srcfile), 1);
+				preprocess($page, $page, $content, 1);
+
+				run_hooks(scan => sub {
+					shift->(
+						page => $page,
+						content => $content,
+					);
+				});
+
 				push @internal_changed, $file;
 			}
 			else {
@@ -767,10 +769,14 @@ sub refresh () {
 	my ($new, $internal_new)=find_new_files($files);
 	my ($del, $internal_del)=find_del_files($pages);
 	my ($changed, $internal_changed)=find_changed($files);
-	run_hooks(needsbuild => sub { shift->($changed) });
+	run_hooks(needsbuild => sub {
+		my $ret=shift->($changed, [@$del, @$internal_del]);
+		$changed=$ret if ref $ret eq 'ARRAY';
+	});
 	my $oldlink_targets=calculate_old_links($changed, $del);
 
 	foreach my $file (@$changed) {
+		print ">>render $file\n";
 		scan($file);
 	}