X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Frestore_form.ml;h=8e18f45036bce336d2010dc33a3eabdf23d77be1;hb=eeb304015c65ccf593a77058d5db5f5a3e3b45d5;hp=4eb681bb31f21291dad8ceb75ce14eeb65a0aa0c;hpb=1f125fd7a6794f352f30de71a3905d5356a07008;p=cocanwiki.git diff --git a/scripts/restore_form.ml b/scripts/restore_form.ml index 4eb681b..8e18f45 100644 --- a/scripts/restore_form.ml +++ b/scripts/restore_form.ml @@ -1,7 +1,22 @@ -(* COCANWIKI scripts. +(* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: restore_form.ml,v 1.6 2004/09/09 09:35:33 rich Exp $ + * $Id: restore_form.ml,v 1.8 2004/09/23 11:56:47 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *) open Apache @@ -36,7 +51,7 @@ 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