* Fix sending of commit mails when new pages are added via the web.

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index ba6f3d3a926cdb757a137d3d0df1ae9e230779a1..d32f5c1bf9436fb30cfb93992723a554f3be8692 100644 (file)
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -94,12 +94,8 @@ sub set_banned_users (@) { #{{{
 
 sub commit_notify_list ($@) { #{{{
        my $committer=shift;
-       
-       my @pages;
-       foreach my $file (@_) {
-               push @pages, grep { $pagesources{$_} eq $file } keys %pagesources;
-       }
-       
+       my @pages = map pagename($_), @_;
+
        my @ret;
        my $userinfo=userinfo_retrieve();
        foreach my $user (keys %{$userinfo}) {
@@ -108,7 +104,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};
                }
        }

diff --git a/debian/changelog b/debian/changelog
index d0b481a342f37fdb318b79e0943158ce2a4ca6f4..b9dc7fae431082851f0a4a21fa31552d2af96ab3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,9 @@ ikiwiki (1.51) UNRELEASED; urgency=low
   * Due to template changes and style sheet changes that depend on them,
     wiki rebuilds are recommended on upgrade to this version.
   * Avoid .svn directories when installing from svn checkout.
+  * Fix sending of commit mails when new pages are added via the web.
 
- -- Joey Hess <joeyh@debian.org>  Thu, 26 Apr 2007 18:47:38 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 26 Apr 2007 19:27:42 -0400
 
 ikiwiki (1.50) unstable; urgency=low
 

diff --git a/doc/bugs/no_commit_mails_for_new_pages.mdwn b/doc/bugs/no_commit_mails_for_new_pages.mdwn
index b65c8393a6d0ec388a8ecafc69a6188a29f74dfa..3773a945524b273daaece85d30b7ef796c4487c2 100644 (file)
--- a/doc/bugs/no_commit_mails_for_new_pages.mdwn
+++ b/doc/bugs/no_commit_mails_for_new_pages.mdwn
@@ -4,3 +4,7 @@ the same page do result in commit mails.
 
 (Granted, this could be almost considered a feature, if the new page is in
 an rss feed..)
+
+Turned out to occur only for web commits that added a new file, since now
+the wiki does not rebuild during the commit hook in a web commit, it could
+not rely on `%pagesources` having the file. [[done]] --[[Joey]]