Added a "side-by-side" mode using ''diff -y''. Disabled by default,

[cocanwiki.git] / scripts / restore_form.ml

diff --git a/scripts/restore_form.ml b/scripts/restore_form.ml
index 68f47c4..4e9552a 100644 (file)
--- a/scripts/restore_form.ml
+++ b/scripts/restore_form.ml
@@ -1,7 +1,7 @@
 (* 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.7 2004/09/09 12:21:22 rich Exp $
+ * $Id: restore_form.ml,v 1.9 2004/10/30 10:16:10 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
@@ -29,7 +29,7 @@ open Cocanwiki_template
 open Cocanwiki_ok
 open Cocanwiki_diff
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid _ user =
   let template = get_template dbh hostid "restore_form.html" in
 
   (* Parameters. *)
@@ -51,10 +51,10 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   if version = old_version then (
     error ~back_button:true ~title:"Restoring live version"
       q "You seem to be trying to restore the live version.";
-    raise CgiExit
+    return ()
   );
 
-  let diff, _ = get_diff dbh hostid page ~old_version ~version () in
+  let diff, _ = get_diff dbh hostid ~user page ~old_version ~version () in
 
   (* Display the diff. *)
   template#set "diff" diff;