X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Flib%2Fcocanwiki_emailnotify.ml;h=07e759722b51d017a16a109fddaf4c4c8813f83d;hb=ec0b2fe822bac60e194044fdb7092156705e4595;hp=648a746e29aebf24d71a72663fa23f2106ca5108;hpb=2faa766a005f4fc4f1fd48a36185452f77ceb2b9;p=cocanwiki.git

diff --git a/scripts/lib/cocanwiki_emailnotify.ml b/scripts/lib/cocanwiki_emailnotify.ml
index 648a746..07e7597 100644
--- a/scripts/lib/cocanwiki_emailnotify.ml
+++ b/scripts/lib/cocanwiki_emailnotify.ml
@@ -1,7 +1,7 @@
 (* COCANWIKI - a wiki written in Objective CAML.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: cocanwiki_emailnotify.ml,v 1.2 2004/10/21 19:54:29 rich Exp $
+ * $Id: cocanwiki_emailnotify.ml,v 1.3 2004/10/23 15:00:16 rich Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,11 +43,13 @@ let email_notify ~subject ~body ?user (dbh : Dbi.connection) hostid =
 
   (* Send a change email to everyone who hasn't opted out using
    * their preferences.  This behaviour replaces the old
-   * 'email_notify' table.
+   * 'email_notify' table.  Don't send email to invited accounts
+   * who have not yet confirmed.
    *)
   let sth = dbh#prepare_cached "select email, name from users
                                  where hostid = ? and id <> ? and email_notify
-                                   and email is not null" in
+                                   and email is not null
+                                   and invite is null" in
   sth#execute [`Int hostid; `Int own_userid];
 
   let to_addr = sth#map (function