X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fedit.ml;h=8b4482312b7344347720bb0455203768c080d14a;hb=295f2cde3f43ccf7f775d39b95925e10aa4c37cb;hp=2e9ee5078571d80b6d088d09169973dd6938d4f3;hpb=32f71ff9f960ecb191f256a6cfc11a3f2c0c0cf7;p=cocanwiki.git diff --git a/scripts/edit.ml b/scripts/edit.ml index 2e9ee50..8b44823 100644 --- a/scripts/edit.ml +++ b/scripts/edit.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: edit.ml,v 1.24 2004/11/01 12:57:53 rich Exp $ + * $Id: edit.ml,v 1.26 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,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user = ignore (String.find ua "MSIE"); (* Throws Invalid_string if not found. *) true with - Not_found | String.Invalid_string -> false in + Not_found | Invalid_string -> false in template#conditional "msie" msie; (* Build the internal model from the parameters passed to the script. *) @@ -407,7 +407,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user = template_email#set "opt_out" opt_out; let body = template_email#to_string in Sendmail.send_mail ~subject - ~to_addr:[to_addr] ~body ()) + ~to_addr:[to_addr] body) addrs );