X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fedit.ml;h=5bdf1832b0ab59e1ddf69872d8c679c9ca9c75d4;hb=6b0b6830a2e784eee99dcd1b1a3cb8b44e27c765;hp=00d48abf5d84612ddddee2b3d55025fd491bb4e4;hpb=3da6ded17ea2cca64328e5f3ea8903cd15103bc2;p=cocanwiki.git diff --git a/scripts/edit.ml b/scripts/edit.ml index 00d48ab..5bdf183 100644 --- a/scripts/edit.ml +++ b/scripts/edit.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: edit.ml,v 1.10 2004/09/21 13:01:15 rich Exp $ + * $Id: edit.ml,v 1.11 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 @@ -382,7 +382,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user = template_conflict#set "url" url; q#template template_conflict; - raise CgiExit + return () ); (* Defer the pages_redirect_cn constraint because that would @@ -492,11 +492,11 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user = let id = int_of_string (q#param "id") in if q#param_true "cancel" then ( cancel id; - raise CgiExit + return () ); if q#param_true "save" then ( let ok = try_save () in - if ok then raise CgiExit (* ... else fall through *) + if ok then return () (* ... else fall through *) ); continue_editing () (* Processes the action, if any. *) with