- made the user information block into two different blocks. One for

  login and one for user information.
- added link to help in book module (post-patch, see below).
- applied various patches:
  Patch by Greg Tyrelle <greg@tyrelle.net>
  - tracker module now shows usernames next to comments.

  Patch by Moshe Weitzman <moshe@wallaware.com>
  - book module has a more complete help.
  - added administrative link to export book to html
  - fixed non book nodes not showing up in trees.

  Patch by moshe weitzman <weitzman@tejasa.com>
  - links can be defined in the configuration file.

2 files changed, 22 insertions, 10 deletions

diff --git a/includes/common.inc b/includes/common.inc
index 847a0839c..ce5b3a25c 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -594,18 +594,21 @@ function field_merge($a, $b) {
 }
 
 function link_page() {
-
-  $links[] = "<a href=\"index.php\">". t("home") ."</a>";
-
-  foreach (module_list() as $name) {
-    if (module_hook($name, "link")) {
-      $links = array_merge($links, module_invoke($name, "link", "page"));
+  global $custom_links;
+  
+  if (is_array($custom_links)) {
+    return $custom_links;
+  }
+  else {
+    $links[] = "<a href=\"index.php\">". t("home") ."</a>";
+    foreach (module_list() as $name) {    
+      if (module_hook($name, "link")) {
+        $links = array_merge($links, module_invoke($name, "link", "page"));
+      }  
     }
+    return $links;
   }
-
-
-  return $links;
-}
+}  
 
 function link_node($node, $main = 0) {
   foreach (module_list() as $name) {
diff --git a/includes/conf.php b/includes/conf.php
index f0963df62..74bb1f061 100644
--- a/includes/conf.php
+++ b/includes/conf.php
@@ -45,4 +45,13 @@ $themes = array("UnConeD" => array(
 #   appropriately.
 $languages = array("en" => "English");
 
+# Custom Navigation Links override the standard page links
+# offerred by most Drupal modules. Administrators may
+# add/remove/reorder nav links here. These links are typically
+# displayed in a row near the top of every page.
+# $custom_links = array(
+#  "<a href=\"\index.php\">home</a>",
+#  "<a href=\"\module.php?mod=user\">school</a>",
+#  "<a href=\"\module.php?mod=blog\">work</a>");
+
 ?>
\ No newline at end of file