From d513396938a8682bf1a9971c752c425587198ef9 Mon Sep 17 00:00:00 2001 From: rich Date: Sun, 10 Oct 2004 16:31:52 +0000 Subject: [PATCH] Another critical bug fix. --- scripts/page.ml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/page.ml b/scripts/page.ml index e301cae..f741e58 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.29 2004/10/10 16:29:23 rich Exp $ + * $Id: page.ml,v 1.30 2004/10/10 16:31:52 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 @@ -296,7 +296,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid (* Navigation links. *) if navigation then ( - let max_links = 15 in (* Show no more links than this. *) + let max_links = 18 in (* Show no more links than this. *) (* What links here. *) let wlh = what_links_here dbh hostid page' in @@ -309,6 +309,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid * links here' section, and don't link to self. *) let not_urls = page' :: wlh_urls in + let limit = max_links - List.length wlh_urls in let qs = Dbi.placeholders (List.length not_urls) in let sth = dbh#prepare_cached @@ -321,7 +322,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid limit ?") in let args = List.map (fun s -> `String s) not_urls in sth#execute - ([`Int hostid; `Int userid] @ args @ [`Int max_links]); + ([`Int hostid; `Int userid] @ args @ [`Int limit]); sth#map (function [`String url; `String title; _] -> url, title -- 1.8.3.1