X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Frestore.ml;h=ed7f383771ee59caa7cc66c5b785357ec415a456;hb=0d913c7fee349ac0d46a9f9ce31977b2e5c545af;hp=3b7bd24d7c7caa5353b5ff74183ec67c495dac57;hpb=eeb304015c65ccf593a77058d5db5f5a3e3b45d5;p=cocanwiki.git

diff --git a/scripts/restore.ml b/scripts/restore.ml
index 3b7bd24..ed7f383 100644
--- a/scripts/restore.ml
+++ b/scripts/restore.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.ml,v 1.10 2004/09/28 10:56:40 rich Exp $
+ * $Id: restore.ml,v 1.16 2004/11/01 12:57:53 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
@@ -41,7 +41,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
 
     let logged_user =
       match user with
-	| User (id, _, _) -> `Int id
+	| User (id, _, _, _) -> `Int id
 	| _ -> `Null in
 
     (* Copy the old version of the page to be live. *)
@@ -61,7 +61,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
     let sth =
       dbh#prepare_cached
 	"set constraints pages_redirect_cn, sitemenu_url_cn,
-             page_emails_url_cn, links_from_cn, links_to_cn deferred" in
+             page_emails_url_cn, links_from_cn, recently_visited_url_cn
+             deferred" in
     sth#execute [];
 
     let sth = dbh#prepare_cached "update pages set url_deleted = url,
@@ -86,6 +87,9 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
                                    where pageid = ?" in
     sth#execute [`Int pageid; `Int version];
 
+    (* Keep the links table in synch. *)
+    Cocanwiki_links.update_links_for_page dbh hostid page;
+
     dbh#commit ();
 
     (* Email notify. *)
@@ -96,7 +100,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
       "Page: http://" ^ hostname ^ "/" ^ page ^ "\n\n" ^
       diff in
 
-    email_notify ~body ~subject dbh hostid;
+    email_notify ~body ~subject ~user dbh hostid;
 
     (* Done. *)
     let buttons = [ ok_button ("/" ^ page) ] in