diff options
-rw-r--r-- | IkiWiki/Rcs/SVN.pm | 1 | ||||
-rw-r--r-- | templates/notifymail.tmpl | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/IkiWiki/Rcs/SVN.pm b/IkiWiki/Rcs/SVN.pm index 7d48abb61..a2e2ff69c 100644 --- a/IkiWiki/Rcs/SVN.pm +++ b/IkiWiki/Rcs/SVN.pm @@ -188,6 +188,7 @@ sub rcs_notify () { #{{{ my $diff=`svnlook diff $config{svnrepo} -r $rev --no-diff-deleted`; my $user=`svnlook author $config{svnrepo} -r $rev`; + chomp $user; my $message=`svnlook log $config{svnrepo} -r $rev`; if ($message=~/$svn_webcommit/) { $user="$1"; diff --git a/templates/notifymail.tmpl b/templates/notifymail.tmpl index 5a1497a3f..d5b344835 100644 --- a/templates/notifymail.tmpl +++ b/templates/notifymail.tmpl @@ -1,5 +1,5 @@ -The following change has been made to <TMPL_VAR WIKINAME> +The following change was made to <TMPL_VAR WIKINAME> by <TMPL_VAR USER>: -<TMPL_VAR MESSAGE> +<TMPL_VAR MESSAGE> <TMPL_VAR DIFF> |