From 1e4308a939723529b665ac7e0e0356950a0507f7 Mon Sep 17 00:00:00 2001
From: Kjartan Mannes <kjartan@2.no-reply.drupal.org>
Date: Tue, 2 Apr 2002 09:45:57 +0000
Subject: - 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.
---
 includes/common.inc | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'includes/common.inc')

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) {
-- 
cgit v1.2.3