From 1421c878d16f7d88bcc85c0dfc4b7c006b267526 Mon Sep 17 00:00:00 2001 From: Kjartan Mannes Date: Sun, 9 Mar 2003 17:19:50 +0000 Subject: - Moved moderation logic back into node module. * After having a chat with Dries we have agreed on the logics (or more specifically he told me how its supposed to work). The queue module is just a method to make moderation public, but its not necessarily the only way. This brings the power back. - Minor interface tweaks (names, case changes, etc). - Fixed error that would show when you tried to view the profile of a blocked user. --- modules/user.module | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'modules/user.module') diff --git a/modules/user.module b/modules/user.module index 425a8029c..132b61db1 100644 --- a/modules/user.module +++ b/modules/user.module @@ -1046,8 +1046,9 @@ function user_view($uid = 0) { theme("footer"); } else { + $output = user_login(); theme("header"); - theme("box", t("Log in"), user_login()); + theme("box", t("Log in"), $output); if (variable_get("user_register", 1)) { theme("box", t("Create new user account"), user_register()); } @@ -1500,10 +1501,10 @@ function user_admin_account() { $rows[] = array(format_name($account), format_date($account->timestamp, "small"), l(t("edit account"), "admin/user/edit/$account->uid")); } - if ($pager = pager_display(NULL, 50, 0, "admin")) { + $pager = pager_display(NULL, 50, 0, "admin"); + if (!empty($pager)) { $rows[] = array(array("data" => $pager, "colspan" => 3)); } - return table($header, $rows); } -- cgit v1.2.3