X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fedit_page_css_form.ml;h=25f317bb07b605853d53c87070a0b6c6f871c3fc;hb=262f6a0c34949247ba6b78399b787e693da38d86;hp=d58c64138759ac55390f09ff0d9c9394febbc3bc;hpb=bfa88724ee152ba00c2b2fca881dd78a6599820a;p=cocanwiki.git diff --git a/scripts/edit_page_css_form.ml b/scripts/edit_page_css_form.ml index d58c641..25f317b 100644 --- a/scripts/edit_page_css_form.ml +++ b/scripts/edit_page_css_form.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_page_css_form.ml,v 1.7 2006/03/27 18:09:46 rich Exp $ + * $Id: edit_page_css_form.ml,v 1.8 2006/03/27 19:10:29 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 @@ -32,15 +32,12 @@ let run r (q : cgi) dbh hostid _ _ = let page = q#param "page" in - let sth = dbh#prepare_cached "select css from pages - where hostid = ? and url = ?" in - sth#execute [Some hostid; Some page]; + let css = List.hd ( + PGSQL(dbh) "select css from pages + where hostid = $hostid and url = $page" + ) in - let css = - match sth#fetch1 () with - | [ None ] -> "" - | [ Some css ] -> css - | _ -> assert false in + let css = match css with None -> "" | Some css -> css in template#set "page" page; template#set "css" css;