- Patch 185 by Ax: fixed undefined variables, synchronized xtemplate with sf, etc.

1 files changed, 5 insertions, 3 deletions

diff --git a/modules/user/user.module b/modules/user/user.module
index 93d6d9570..2c2d23537 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -306,8 +306,11 @@ function user_block($op = "list", $delta = 0) {
      return $blocks;
   }
   else {
+    $block = array();
+
     switch ($delta) {
       case 0:
+
         if (!$user->uid) {
           /*
           ** For usability's sake, avoid showing two login forms on one
@@ -366,7 +369,6 @@ function user_block($op = "list", $delta = 0) {
            $block["subject"] = $user->uid ? $user->name : t("Navigation");
            $block["content"] = "<div class=\"menu\">". $menu ."</div>";
         }
-
         return $block;
       case 2:
         if (user_access("access content")) {
@@ -415,9 +417,9 @@ function user_block($op = "list", $delta = 0) {
               }
             }
           }
+          $block["subject"] = t("Who's online");
+          $block["content"] = $output;
         }
-        $block["subject"] = t("Who's online");
-        $block["content"] = $output;
         return $block;
     }
   }