X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fedit.ml;h=2e9ee5078571d80b6d088d09169973dd6938d4f3;hb=6ad484dd47c27fd54c2f26fb931ba125bae9abc6;hp=aa3daa68570d79a9513dea4a466b4223354e30cd;hpb=c5f822d1ca81042a8c0be2955668b0abebf1b11c;p=cocanwiki.git

diff --git a/scripts/edit.ml b/scripts/edit.ml
index aa3daa6..2e9ee50 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.23 2004/10/30 10:16:10 rich Exp $
+ * $Id: edit.ml,v 1.24 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
@@ -359,15 +359,14 @@ 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 ~user 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
 	      let new_page =
 		page_for_diff css (List.map (fun (sectionname, _, content) ->
 				sectionname, content) model.contents) in
-	      let our_diff = diff_cmd ~user old_page new_page in
+	      let our_diff = diff_cmd old_page new_page in
 
 	      (* Fill out the conflict template. *)
 	      template_conflict#set "other_diff" other_diff;
@@ -427,7 +426,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
 
       let body = fun () ->
 	(* Prepare the diff between this version and the previous version. *)
-	let diff, _ = get_diff dbh hostid ~user url ~version:pageid () in
+	let diff, _ = get_diff dbh hostid url ~version:pageid () in
 	"Page: http://" ^ hostname ^ "/" ^ url ^ "\n\n" ^
 	diff in