Index: fbconnect.module
===================================================================
--- fbconnect.module	(revision 3856)
+++ fbconnect.module	(revision 3857)
@@ -704,9 +704,7 @@
 
     case 'view':
       global $user;
-      if ($user->uid && fbconnect_get_fbuid()) {
-        $blocks['content'] = fbconnect_block_render($user);
-      }
+      $blocks['content'] = fbconnect_block_render($user);
     return $blocks;
   }
 }
@@ -716,6 +714,20 @@
  */
 function fbconnect_block_render($user) {
   $fbuid = fbconnect_get_fbuid();
+  $user_fbuid = fbconnect_check_register($user->uid);
+  if (!$fbuid || !$user_fbuid || $fbuid != $user_fbuid) {
+    if (!$fbuid) {
+      $msg = t("You are not logged into Facebook.");
+      $msg .= '<br>' . fbconnect_render_button();
+    } else if (!$user_fbuid) {
+      $msg = t("Your account is not linked to a Facebook account.");
+      $msg .= '<br>'.l('Link your account to Facebook','user/'.$user->uid.'/fbconnect');
+    } else {
+      $msg = t("Your account is linked to a different Facebook account than the one you are currently logged in as.  Please log in to your linked Facebook account.");
+    }
+    return $msg;
+  }
+
   // Check for a cached version of this block. 
   $cid = 'fbconnect:block:fbuid:'. $fbuid;
   if ($cached = cache_get($cid)) {
@@ -1244,7 +1256,6 @@
  */
 function theme_block_fbconnect($data, $account) {
   if (!empty($data)) {
-    $output = '<div class="title">'. t('Welcome @username.', array('@username' => $account->name)) .'</div>';
     $output .= $data['friend_link'];
     if (!empty($data['friend_list'])) {
       $output .= '<div>'. t('My friends') .'</div>';

Process svn finished