X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Flib%2Fcocanwiki_emailnotify.ml;h=59f3b04e18d500de12b06758e02784915f4de473;hb=295f2cde3f43ccf7f775d39b95925e10aa4c37cb;hp=7d014c54f94342fd80b89c02f9fc82581400176c;hpb=c5f822d1ca81042a8c0be2955668b0abebf1b11c;p=cocanwiki.git

diff --git a/scripts/lib/cocanwiki_emailnotify.ml b/scripts/lib/cocanwiki_emailnotify.ml
index 7d014c5..59f3b04 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.4 2004/10/30 10:16:10 rich Exp $
+ * $Id: cocanwiki_emailnotify.ml,v 1.6 2005/03/31 14:24:04 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
@@ -48,7 +48,8 @@ let email_notify ~subject ~body ?user (dbh : Dbi.connection) hostid =
    * '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
+  let sth = dbh#prepare_cached "select email, name
+                                  from users
                                  where hostid = ? and id <> ? and email_notify
                                    and email is not null
                                    and invite is null" in
@@ -69,5 +70,5 @@ let email_notify ~subject ~body ?user (dbh : Dbi.connection) hostid =
     let subject = "Site notice: " ^ subject in
 
     (* Send the email. *)
-    Sendmail.send_mail ~subject ~to_addr ~body ?from ()
+    Sendmail.send_mail ~subject ~to_addr ?from body
   )