X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b6e6a2154d8be7da67dd6adc371100129fd1f752..dd0e043fd8bf69edaeec469e6560944cacdc984f:/IkiWiki/UserInfo.pm

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index 99b3c9f0a..8bd056248 100644
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -92,14 +92,13 @@ sub set_banned_users (@) { #{{{
 	return userinfo_store($userinfo);
 } #}}}
 
+# Global used to pass information into the PageSpec function.
+our $committer;
+
 sub commit_notify_list ($@) { #{{{
-	my $committer=shift;
-	
-	my @pages;
-	foreach my $file (@_) {
-		push @pages, grep { $pagesources{$_} eq $file } keys %pagesources;
-	}
-	
+	$committer=shift;
+	my @pages = map pagename($_), @_;
+
 	my @ret;
 	my $userinfo=userinfo_retrieve();
 	foreach my $user (keys %{$userinfo}) {
@@ -108,7 +107,8 @@ sub commit_notify_list ($@) { #{{{
 		    length $userinfo->{$user}->{subscriptions} &&
 		    exists $userinfo->{$user}->{email} &&
 		    length $userinfo->{$user}->{email} &&
-		    grep { pagespec_match($_, $userinfo->{$user}->{subscriptions}, "") } @pages) {
+		    grep { pagespec_match($_, $userinfo->{$user}->{subscriptions}, "") }
+	    	    	map pagename($_), @_) {
 			push @ret, $userinfo->{$user}->{email};
 		}
 	}
@@ -157,7 +157,6 @@ 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;
-		eval q{use POSIX 'setsid'};
 		setsid() or error("Can't start a new session: $!");
 		chdir '/';
 		open STDIN, '/dev/null';
@@ -181,4 +180,13 @@ sub send_commit_mails ($$$@) { #{{{
 	}
 } #}}}
 
+package IkiWiki::PageSpec;
+
+sub match_user ($$$) { #{{{
+	shift;
+	my $user=shift;
+
+	return $user eq $committer;
+} #}}}
+
 1