X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fedit.ml;h=893a17fa7676039870aea5ec6aaa89879b4efe53;hb=e336401181f56f19ec18175d47462e7a5d5f07e2;hp=abf8e3ca60d409bab2ffee9a005cef4ca83a9389;hpb=bfc0f85bc1869f5139505dd6ffbacecb1af564a4;p=cocanwiki.git

diff --git a/scripts/edit.ml b/scripts/edit.ml
index abf8e3c..893a17f 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 <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: edit.ml,v 1.22 2004/10/25 07:44:55 rich Exp $
+ * $Id: edit.ml,v 1.25 2004/12/01 13:55:55 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
@@ -48,7 +48,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
       ignore (String.find ua "MSIE"); (* Throws Invalid_string if not found. *)
       true
     with
-	Not_found | String.Invalid_string -> false in
+	Not_found | Invalid_string -> false in
   template#conditional "msie" msie;
 
   (* Build the internal model from the parameters passed to the script. *)
@@ -359,8 +359,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
 	  | SaveConflict (new_version, old_version, url, css) ->
 	      (* Edited by someone else ...  Get the other's changes. *)
 	      let other_diff, _ =
-		get_diff dbh hostid url
-		  ~old_version ~version:new_version () in
+		get_diff dbh hostid url ~old_version ~version:new_version () in
 
 	      (* Synthesize our own changes. *)
 	      let old_page = get_version_for_diff dbh old_version in