git.annexia.org
/
cocanwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bumped version for release.
[cocanwiki.git]
/
scripts
/
page.ml
diff --git
a/scripts/page.ml
b/scripts/page.ml
index
67ac47c
..
535b49e
100644
(file)
--- 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 <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: page.ml,v 1.3
7 2004/10/30 10:16:10
rich Exp $
+ * $Id: page.ml,v 1.3
8 2004/11/03 13:36:45
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
*
* 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
@@
-65,15
+65,14
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid
(* Host-specific fields. *)
let sth = dbh#prepare_cached "select css is not null,
feedback_email is not null,
(* Host-specific fields. *)
let sth = dbh#prepare_cached "select css is not null,
feedback_email is not null,
- mailing_list,
search_box,
navigation
+ mailing_list, navigation
from hosts where id = ?" in
sth#execute [`Int hostid];
from hosts where id = ?" in
sth#execute [`Int hostid];
- let has_host_css, has_feedback_email, mailing_list,
search_box,
navigation =
+ let has_host_css, has_feedback_email, mailing_list, navigation =
match sth#fetch1 () with
| [ `Bool has_host_css; `Bool has_feedback_email; `Bool mailing_list;
match sth#fetch1 () with
| [ `Bool has_host_css; `Bool has_feedback_email; `Bool mailing_list;
- `Bool search_box; `Bool navigation ] ->
- has_host_css, has_feedback_email, mailing_list, search_box,
- navigation
+ `Bool navigation ] ->
+ has_host_css, has_feedback_email, mailing_list, navigation
| _ -> assert false in
(* User permissions. *)
| _ -> assert false in
(* User permissions. *)
@@
-195,7
+194,6
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid
t#conditional "has_feedback_email" has_feedback_email;
t#conditional "mailing_list" mailing_list;
t#conditional "has_feedback_email" has_feedback_email;
t#conditional "mailing_list" mailing_list;
- t#conditional "search_box" search_box;
t#conditional "navigation" navigation;
t#conditional "can_edit" can_edit;
t#conditional "navigation" navigation;
t#conditional "can_edit" can_edit;