From d6ce51e4ce39c143732f69de9a5590428d6e3c6c Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 10 Feb 2001 11:59:06 +0000
Subject: - added a "search framework" which allows for easy searching   (to be
 continued) - tidyied up some existing code

---
 includes/common.inc   | 3 ++-
 includes/function.inc | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'includes')

diff --git a/includes/common.inc b/includes/common.inc
index f5ebc09d6..3cda625af 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -15,8 +15,9 @@ include_once "includes/$conf.conf";
 include_once "includes/database.inc";
 include_once "includes/watchdog.inc";
 include_once "includes/function.inc";
-include_once "includes/module.inc";
+include_once "includes/search.inc";
 include_once "includes/locale.inc";
+include_once "includes/module.inc";
 include_once "includes/theme.inc";
 include_once "includes/user.inc";
 
diff --git a/includes/function.inc b/includes/function.inc
index 98a9da53e..c8b027934 100644
--- a/includes/function.inc
+++ b/includes/function.inc
@@ -76,8 +76,9 @@ function format_data($field, $replacement = "<I>na</I>") {
   return ($field) ? $field : $replacement;
 }
 
-function format_username($username, $admin = 0) {
-  if ($username) return ($admin) ? "<A HREF=\"admin.php?mod=account&op=view&name=$username\">$username</A>" : "<A HREF=\"account.php?op=view&name=$username\">$username</A>";
+function format_username($username) {
+  global $user;
+  if ($username) return (user_permission($user) ? "<A HREF=\"admin.php?mod=account&op=view&name=$username\">$username</A>" : "<A HREF=\"account.php?op=view&name=$username\">$username</A>");
   else { global $anonymous; return $anonymous; }
 }
 
-- 
cgit v1.2.3