(* 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.22 2004/10/25 07:44:55 rich Exp $
+ * $Id: edit.ml,v 1.27 2005/11/24 14:54:11 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. *)
return ()
| Wikilib.GenURL_TooShort | Wikilib.GenURL_BadURL ->
error ~back_button:true ~title:"Bad page name"
- q "The page name supplied is too short or invalid.";
+ dbh hostid q
+ "The page name supplied is too short or invalid.";
return () in
let model = match pt with
with
SaveURLError ->
error ~back_button:true ~title:"Page exists"
- q ("While you were editing that page, it looks " ^
- "like another user created the same page.");
+ dbh hostid q ("While you were editing that page, it looks " ^
+ "like another user created the same page.");
return ()
| SaveConflict (new_version, old_version, url, css) ->
(* Edited by someone else ... Get the other's changes. *)
let other_diff, _ =
- get_diff dbh hostid 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
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
);
return ()
in
- (* This codes decides where we are in the current editing cycle.
+ (* This code decides where we are in the current editing cycle.
*
* Inputs:
* id - if set, then we are in the midst of editing a page.