summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-04-25 00:45:10 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-04-25 00:45:10 +0000
commit1ba7023746b17c3f044b71799ffa304f49a7cf73 (patch)
tree4a491112b0da3a8cca7b8286a3c846717cae7076
parentec9e013f3c08a40af8a9a585a4a984db41ee7d89 (diff)
more
-rw-r--r--IkiWiki/UserInfo.pm2
-rw-r--r--templates/notifymail.tmpl3
2 files changed, 2 insertions, 3 deletions
diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index 8c27714b8..b322b607e 100644
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -74,7 +74,7 @@ sub page_subscribers (@) { #{{{
length $userinfo->{$user}->{subscriptions} &&
exists $userinfo->{$user}->{email} &&
length $userinfo->{$user}->{email} &&
- grep { glob_match($_, $userinfo->{$user}->{subscriptions}) } @_) {
+ grep { globlist_match($_, $userinfo->{$user}->{subscriptions}) } @_) {
push @ret, $userinfo->{$user}->{email};
}
}
diff --git a/templates/notifymail.tmpl b/templates/notifymail.tmpl
index d5b344835..978b8a2a3 100644
--- a/templates/notifymail.tmpl
+++ b/templates/notifymail.tmpl
@@ -1,5 +1,4 @@
-The following change was made to <TMPL_VAR WIKINAME>
-by <TMPL_VAR USER>:
+The following change was made to <TMPL_VAR WIKINAME> by <TMPL_VAR USER>:
<TMPL_VAR MESSAGE>
<TMPL_VAR DIFF>