(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: edit.ml,v 1.23 2004/10/30 10:16:10 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
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. *)
| SaveConflict (new_version, old_version, url, css) ->
(* Edited by someone else ... Get the other's changes. *)
let other_diff, _ =
- get_diff dbh hostid ~user url
- ~old_version ~version:new_version () in
+ get_diff dbh hostid url ~old_version ~version:new_version () in
(* Synthesize our own changes. *)
let old_page = get_version_for_diff dbh old_version in
let new_page =
page_for_diff css (List.map (fun (sectionname, _, content) ->
sectionname, content) model.contents) in
- let our_diff = diff_cmd ~user old_page new_page in
+ let our_diff = diff_cmd old_page new_page in
(* Fill out the conflict template. *)
template_conflict#set "other_diff" other_diff;
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
);
let body = fun () ->
(* Prepare the diff between this version and the previous version. *)
- let diff, _ = get_diff dbh hostid ~user url ~version:pageid () in
+ let diff, _ = get_diff dbh hostid url ~version:pageid () in
"Page: http://" ^ hostname ^ "/" ^ url ^ "\n\n" ^
diff in