From: rich <rich>
Date: Sun, 10 Oct 2004 16:40:32 +0000 (+0000)
Subject: If the navigation box would show as empty, disable it.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=595bd1b7c016e106d45907100a79754c9daf9fb0;p=cocanwiki.git

If the navigation box would show as empty, disable it.
---

diff --git a/debian/changelog b/debian/changelog
index 9f83c52..405666a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cocanwiki (1.2.1-5) unstable; urgency=low
+cocanwiki (1.2.1-6) unstable; urgency=low
 
   * Initial Release.
 
diff --git a/scripts/page.ml b/scripts/page.ml
index f741e58..90f8a5b 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 <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: page.ml,v 1.30 2004/10/10 16:31:52 rich Exp $
+ * $Id: page.ml,v 1.31 2004/10/10 16:40:32 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
@@ -339,6 +339,11 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid
       let table = List.map f rv in
       t#table "recently_visited" table;
       t#conditional "has_recently_visited" (rv <> []);
+
+      (* If both lists are empty (ie. an empty navigation box would
+       * appear), then disable navigation altogether.
+       *)
+      if wlh = [] && rv = [] then t#conditional "navigation" false
     );
 
     (* If we are coming from a search engine then we want to highlight