web commit by http://fabian.linzberger.net/

[git.ikiwiki.info.git] / IkiWiki / UserInfo.pm

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index 34f05203a10f2367f7f583ce7d6365da1cd8c6d0..115a263ce09481d073837f878aa64ab347019f11 100644 (file)
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -101,7 +101,7 @@ 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}, "") } @pages) {
                        push @ret, $userinfo->{$user}->{email};
                }
        }
@@ -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) {
@@ -123,14 +125,19 @@ sub send_commit_mails ($$$@) { #{{{
                my $diff=$diffsub->();
                my $message=$messagesub->();
 
-               my $subject="update of $config{wikiname}'s ";
+               my $pagelist;
                if (@changed_pages > 2) {
-                       $subject.="$changed_pages[0] $changed_pages[1] etc";
+                       $pagelist="$changed_pages[0] $changed_pages[1] ...";
                }
                else {
-                       $subject.=join(" ", @changed_pages);
+                       $pagelist.=join(" ", @changed_pages);
                }
-               $subject.=" by $user";
+               #translators: The three variables are the name of the wiki,
+               #translators: A list of one or more pages that were changed,
+               #translators: And the name of the user making the change.
+               #translators: This is used as the subject of a commit email.
+               my $subject=sprintf(gettext("update of %s's %s by %s"), 
+                       $config{wikiname}, $pagelist, $user);
 
                my $template=template("notifymail.tmpl");
                $template->param(
@@ -141,14 +148,16 @@ sub send_commit_mails ($$$@) { #{{{
                );
 
                # Daemonize, in case the mail sending takes a while.
-               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: $!");
+               eval q{use POSIX 'setsid'};
+               chdir '/';
+               open STDIN, '/dev/null';
+               open STDOUT, '>/dev/null';
+               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 $@;
@@ -158,8 +167,10 @@ sub send_commit_mails ($$$@) { #{{{
                                From => "$config{wikiname} <$config{adminemail}>",
                                Subject => $subject,
                                Message => $template->output,
-                       ) or error("Failed to send update notification mail");
+                       );
                }
+
+               exit 0; # daemon process done
        }
 } #}}}