diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 3 | ||||
| -rw-r--r-- | includes/function.inc | 5 |
2 files changed, 5 insertions, 3 deletions
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; } } |