X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Frestore.ml;h=ed7f383771ee59caa7cc66c5b785357ec415a456;hb=0d913c7fee349ac0d46a9f9ce31977b2e5c545af;hp=d30ff2b9a4acc082b5d8b1e7459bb3edfb77a757;hpb=247bf3832dcd02aae202dcb706ac20458f6ab1f1;p=cocanwiki.git diff --git a/scripts/restore.ml b/scripts/restore.ml index d30ff2b..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 . * Copyright (C) 2004 Merjis Ltd. - * $Id: restore.ml,v 1.12 2004/10/07 11:36:46 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 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, @@ -99,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