X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fedit_page_css.ml;h=6a02a2350a764b553ea987ec348a6e977833acf1;hb=4bc6c4992dbf48fce59efc39cd31f97f03291383;hp=a37ec899030cdca2a1b20626470516c3514465b7;hpb=11b93485a29771f4d826c50d9efc6d3607dfa50f;p=cocanwiki.git

diff --git a/scripts/edit_page_css.ml b/scripts/edit_page_css.ml
index a37ec89..6a02a23 100644
--- a/scripts/edit_page_css.ml
+++ b/scripts/edit_page_css.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_page_css.ml,v 1.7 2004/09/09 12:21:22 rich Exp $
+ * $Id: edit_page_css.ml,v 1.11 2004/10/07 11:36:46 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
@@ -30,7 +30,7 @@ open Cocanwiki_diff
 open Cocanwiki_emailnotify
 open Cocanwiki_strings
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
   let page = q#param "page" in
   let css = q#param "css" in
 
@@ -41,6 +41,11 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
     try `String (Connection.remote_ip (Request.connection r))
     with Not_found -> `Null in
 
+  let logged_user =
+    match user with
+      | User (id, _, _) -> `Int id
+      | _ -> `Null in
+
   (* Changing the CSS creates a new version of the page.  This enables
    * us to revert changes to the CSS easily.
    *)
@@ -57,7 +62,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
       | _ -> assert false in
 
   let sth = dbh#prepare_cached
-	      "set constraints pages_redirect_cn, sitemenu_url_cn deferred" in
+	      "set constraints pages_redirect_cn, sitemenu_url_cn,
+                   page_emails_url_cn, links_from_cn deferred" in
   sth#execute [];
 
   let sth = dbh#prepare_cached "update pages set url_deleted = url,
@@ -67,10 +73,10 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
 
   let sth = dbh#prepare_cached "insert into pages (hostid, url, title,
                                    description, creation_date, logged_ip,
-                                   redirect, css)
-                                values (?, ?, ?, ?, ?, ?, ?, ?)" in
+                                   logged_user, redirect, css)
+                                values (?, ?, ?, ?, ?, ?, ?, ?, ?)" in
   sth#execute [`Int hostid; `String page; title; description;
-	       creation_date; logged_ip; redirect; css ];
+	       creation_date; logged_ip; logged_user; redirect; css ];
 
   let pageid = sth#serial "pages_id_seq" in