(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: restore.ml,v 1.15 2004/10/30 10:16:10 rich Exp $
+ * $Id: restore.ml,v 1.18 2005/11/19 10:36:42 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
let version = int_of_string (q#param "version") in
let page = q#param "page" in
- if q#param_true "yes" then (
+ if not (q#param_true "no") then (
(* Get the IP address of the user, if available. *)
let logged_ip =
try `String (Connection.remote_ip (Request.connection r))
sth#execute [`Int hostid; `String page; title; description;
creation_date; logged_ip; logged_user; redirect; css ];
- let pageid = sth#serial "pages_id_seq" in
+ let pageid = Int64.to_int (sth#serial "pages_id_seq") in
let sth = dbh#prepare_cached "insert into contents (pageid, ordering,
sectionname, content, divname)
let subject = "Page " ^ page ^ " has been restored." in
let body = fun () ->
(* Prepare the diff between this version and the previous version. *)
- let diff, _ = get_diff dbh hostid ~user page ~version:pageid () in
+ let diff, _ = get_diff dbh hostid page ~version:pageid () in
"Page: http://" ^ hostname ^ "/" ^ page ^ "\n\n" ^
diff in