urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
joey 2007-04-26 23:29:19 +00:00
parent 1fff84233c
commit 01f41560e3
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
IkiWiki/UserInfo.pm
View File

@ -94,12 +94,8 @@ sub set_banned_users (@) { #{{{
sub commit_notify_list ($@) { #{{{ sub commit_notify_list ($@) { #{{{
my $committer=shift; my $committer=shift;
my @pages = map pagename($_), @_;
my @pages;
foreach my $file (@_) {
push @pages, grep { $pagesources{$_} eq $file } keys %pagesources;
}
my @ret; my @ret;
my $userinfo=userinfo_retrieve(); my $userinfo=userinfo_retrieve();
foreach my $user (keys %{$userinfo}) { foreach my $user (keys %{$userinfo}) {
@ -108,7 +104,8 @@ sub commit_notify_list ($@) { #{{{
length $userinfo->{$user}->{subscriptions} && length $userinfo->{$user}->{subscriptions} &&
exists $userinfo->{$user}->{email} && exists $userinfo->{$user}->{email} &&
length $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}; push @ret, $userinfo->{$user}->{email};
} }
} }

3
debian/changelog vendored
View File

@ -20,8 +20,9 @@ ikiwiki (1.51) UNRELEASED; urgency=low
* Due to template changes and style sheet changes that depend on them, * Due to template changes and style sheet changes that depend on them,
wiki rebuilds are recommended on upgrade to this version. wiki rebuilds are recommended on upgrade to this version.
* Avoid .svn directories when installing from svn checkout. * 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 ikiwiki (1.50) unstable; urgency=low

4
doc/bugs/no_commit_mails_for_new_pages.mdwn
View File

@ -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 (Granted, this could be almost considered a feature, if the new page is in
an rss feed..) 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]]