X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/ffb27000431f744f2cec9d198d0a0d8cbb0bd405..c06adfafef8b8e462bf9ceb2856aae9de6d2f3a4:/IkiWiki/UserInfo.pm

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index 34f05203a..d48b8071c 100644
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -112,7 +112,9 @@ sub send_commit_mails ($$$@) { #{{{
 	my $messagesub=shift;
 	my $diffsub=shift;
 	my $user=shift;
-	my @changed_pages=shift;
+	my @changed_pages=@_;
+
+	return unless @changed_pages;
 
 	my @email_recipients=commit_notify_list($user, @changed_pages);
 	if (@email_recipients) {
@@ -141,15 +143,17 @@ sub send_commit_mails ($$$@) { #{{{
 		);
 
 		# Daemonize, in case the mail sending takes a while.
+		defined(my $pid = fork) or error("Can't fork: $!");
+		return if $pid;
+		setsid() or error("Can't start a new session: $!");
 		eval q{use POSIX ’setsid’};
 		chdir '/';
 		open STDIN, '/dev/null';
 		open STDOUT, '>/dev/null';
-		defined(my $pid = fork) or error("Can't fork: $!");
-		return if $pid;
-		setsid() or error("Can't start a new session: $!");
 		open STDERR, '>&STDOUT' or error("Can’t dup stdout: $!");
 
+		unlockwiki(); # don't need to keep a lock on the wiki
+
 		eval q{use Mail::Sendmail};
 		error($@) if $@;
 		foreach my $email (@email_recipients) {
@@ -160,6 +164,8 @@ sub send_commit_mails ($$$@) { #{{{
 				Message => $template->output,
 			) or error("Failed to send update notification mail");
 		}
+
+		exit 0; # daemon process done
 	}
 } #}}}