(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: restore_form.ml,v 1.12 2006/03/27 18:09:46 rich Exp $
+ * $Id: restore_form.ml,v 1.14 2006/12/06 09:46:57 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
open Cocanwiki_diff
let run r (q : cgi) dbh hostid _ user =
- let template = get_template dbh hostid "restore_form.html" in
+ let template = get_template r dbh hostid "restore_form.html" in
(* Parameters. *)
let page = q#param "page" in
(* Compute the diff between the latest version of this page and the
* page we're wanting to restore.
*)
- let sth = dbh#prepare_cached "select id from pages
- where hostid = ? and url = ?" in
- sth#execute [Some hostid; Some page];
-
- let version = sth#fetch1int () in
+ let version = List.hd (
+ PGSQL(dbh)
+ "select id from pages
+ where hostid = $hostid and url = $page"
+ ) in
if version = old_version then (
error ~back_button:true ~title:"Restoring live version"
- dbh hostid q "You seem to be trying to restore the live version.";
+ r dbh hostid q "You seem to be trying to restore the live version.";
return ()
);