X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Flib%2Fcocanwiki.ml;h=4f21cc0d46a216c185f83447571085b52a1ee160;hb=beee5bf06fd433c105fda1386b3e288768221216;hp=553c03a7e3e733e963625a5efac36d8fbfb6f5dd;hpb=c5f822d1ca81042a8c0be2955668b0abebf1b11c;p=cocanwiki.git

diff --git a/scripts/lib/cocanwiki.ml b/scripts/lib/cocanwiki.ml
index 553c03a..4f21cc0 100644
--- a/scripts/lib/cocanwiki.ml
+++ b/scripts/lib/cocanwiki.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: cocanwiki.ml,v 1.2 2004/10/30 10:16:10 rich Exp $
+ * $Id: cocanwiki.ml,v 1.3 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
@@ -53,7 +53,6 @@ type permissions_t = CanView | CanEdit | CanManageUsers | CanManageContacts
 type prefs_t = {
   email : string option;		(* Email address. *)
   email_notify : bool;			(* Email notification. *)
-  diff_sidebyside : bool;		(* Shows diffs side-by-side. *)
 }
 
 (* The "user object". *)
@@ -161,7 +160,7 @@ let register_script ?(restrict = []) ?(anonymous = true) run =
 	       "select u.id, u.name, u.can_edit, u.can_manage_users,
                        u.can_manage_contacts, u.can_manage_site,
                        u.can_edit_global_css, u.can_import_mail,
-                       u.email, u.email_notify, u.diff_sidebyside
+                       u.email, u.email_notify
                   from usercookies uc, users u
                  where uc.cookie = ? and uc.userid = u.id and u.hostid = ?" in
 	   sth#execute [`String cookie; `Int hostid];
@@ -170,8 +169,7 @@ let register_script ?(restrict = []) ?(anonymous = true) run =
 		  `Bool can_edit; `Bool can_manage_users;
 		  `Bool can_manage_contacts; `Bool can_manage_site;
 		  `Bool can_edit_global_css; `Bool can_import_mail;
-		  (`Null | `String _) as email; `Bool email_notify;
-		  `Bool diff_sidebyside ] ->
+		  (`Null | `String _) as email; `Bool email_notify ] ->
 		  (* Every logged in user can view. *)
 		  let perms = [CanView] in
 		  let perms =
@@ -198,8 +196,7 @@ let register_script ?(restrict = []) ?(anonymous = true) run =
 			`Null -> None
 		      | `String email -> Some email in
 		  let prefs = { email = email;
-				email_notify = email_notify;
-				diff_sidebyside = diff_sidebyside } in
+				email_notify = email_notify; } in
 		  User (userid, name, perms, prefs)
 	      | _ -> assert false)
 	 with