diff options
| -rw-r--r-- | modules/user.module | 14 | ||||
| -rw-r--r-- | modules/user/user.module | 14 |
2 files changed, 12 insertions, 16 deletions
diff --git a/modules/user.module b/modules/user.module index 5e25f4d9d..d9169329f 100644 --- a/modules/user.module +++ b/modules/user.module @@ -365,7 +365,7 @@ function user_block($op = "list", $delta = 0) { if ($op == "list") { $blocks[0]["info"] = t("User login"); - $blocks[1]["info"] = t("User information"); + $blocks[1]["info"] = t("Navigation"); $blocks[2]["info"] = t("Who's new"); return $blocks; @@ -373,10 +373,7 @@ function user_block($op = "list", $delta = 0) { else { switch ($delta) { case 0: - if ($user->uid) { - $block["subject"] = $user->name; - } - else { + if (!$user->uid) { /* ** For usability's sake, avoid showing two login forms on one ** page. @@ -426,10 +423,11 @@ function user_block($op = "list", $delta = 0) { $block["subject"] = t("User login"); $block["content"] = "<div class=\"user-login-link\">$output</div>"; } - - $block["content"] .= "<div id=\"menu\">". menu_tree()."</div>"; return $block; - break; + case 1: + $block["subject"] = $user->uid ? $user->name : t("Navigation"); + $block["content"] = "<div id=\"menu\">". menu_tree() ."</div>"; + return $block; case 2: if (user_access("access content")) { $result = db_query_range("SELECT uid, name FROM {users} WHERE status != '0' ORDER BY uid DESC", 0, 5); diff --git a/modules/user/user.module b/modules/user/user.module index 5e25f4d9d..d9169329f 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -365,7 +365,7 @@ function user_block($op = "list", $delta = 0) { if ($op == "list") { $blocks[0]["info"] = t("User login"); - $blocks[1]["info"] = t("User information"); + $blocks[1]["info"] = t("Navigation"); $blocks[2]["info"] = t("Who's new"); return $blocks; @@ -373,10 +373,7 @@ function user_block($op = "list", $delta = 0) { else { switch ($delta) { case 0: - if ($user->uid) { - $block["subject"] = $user->name; - } - else { + if (!$user->uid) { /* ** For usability's sake, avoid showing two login forms on one ** page. @@ -426,10 +423,11 @@ function user_block($op = "list", $delta = 0) { $block["subject"] = t("User login"); $block["content"] = "<div class=\"user-login-link\">$output</div>"; } - - $block["content"] .= "<div id=\"menu\">". menu_tree()."</div>"; return $block; - break; + case 1: + $block["subject"] = $user->uid ? $user->name : t("Navigation"); + $block["content"] = "<div id=\"menu\">". menu_tree() ."</div>"; + return $block; case 2: if (user_access("access content")) { $result = db_query_range("SELECT uid, name FROM {users} WHERE status != '0' ORDER BY uid DESC", 0, 5); |