X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/13e3bf867157226076fcc14a0d3875fd129a66c7..609f48c93cc9017031c11da942a00975c3e7656a:/IkiWiki/UserInfo.pm

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index f4e261563..a944cafa6 100644
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -3,6 +3,7 @@
 use warnings;
 use strict;
 use Storable;
+use IkiWiki;
 
 package IkiWiki;
 
@@ -66,16 +67,24 @@ sub is_admin ($) { #{{{
 	return grep { $_ eq $user_name } @{$config{adminuser}};
 } #}}}
 
-sub page_subscribers (@) { #{{{
+sub commit_notify_list ($@) { #{{{
+	my $committer=shift;
+	
+	my @pages;
+	foreach my $file (@_) {
+		push @pages, grep { $pagesources{$_} eq $file } keys %pagesources;
+	}
+	
 	my @ret;
 	my $userinfo=userinfo_retrieve();
 	foreach my $user (keys %{$userinfo}) {
-		if (exists $user->{subscriptions} &&
-		    length $user->{subscriptions} &&
-		    exists $user->{email} &&
-		    length $user->{email} &&
-		    grep { globmatch($_, $user->{subscriptions}) } @_) {
-			push @ret, $user->{email};
+		next if $user eq $committer;
+		if (exists $userinfo->{$user}->{subscriptions} &&
+		    length $userinfo->{$user}->{subscriptions} &&
+		    exists $userinfo->{$user}->{email} &&
+		    length $userinfo->{$user}->{email} &&
+		    grep { pagespec_match($_, $userinfo->{$user}->{subscriptions}) } @pages) {
+			push @ret, $userinfo->{$user}->{email};
 		}
 	}
 	return @ret;