X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fpage.ml;h=3657919e65846c7d7a7d112503c18fa013ec9bc6;hb=288535f82bf4a5d944536bd0790a54a5f8fb4363;hp=bfd7bd6b9764112436ed44ebd18655dea78e08ce;hpb=1b592b922676bd3080338cf532a3d29d38137189;p=cocanwiki.git diff --git a/scripts/page.ml b/scripts/page.ml index bfd7bd6..3657919 100644 --- a/scripts/page.ml +++ b/scripts/page.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: page.ml,v 1.32 2004/10/10 19:19:58 rich Exp $ + * $Id: page.ml,v 1.33 2004/10/17 19:43:19 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 @@ -56,12 +56,12 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid ({ edit_anon = edit_anon; view_anon = view_anon } as host) user = - let template_page = get_template dbh hostid "page.html" in - let template_404 = get_template dbh hostid "page_404.html" in - let page = q#param "page" in let page = if page = "" then "index" else page in + let template_page = get_template ~page dbh hostid "page.html" in + let template_404 = get_template dbh hostid "page_404.html" in + (* Host-specific fields. *) let sth = dbh#prepare_cached "select css is not null, feedback_email is not null,