From a4a57eabe06b68ea17c3b3fef809b3035a3d56d0 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Thu, 16 Jul 2009 00:47:48 +0000
Subject: [PATCH] More tinkering with logout. I think I got it this time! It's
 been driving me crazy.

---
 plugins/FBConnect/FBConnectPlugin.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/plugins/FBConnect/FBConnectPlugin.php b/plugins/FBConnect/FBConnectPlugin.php
index 65870a187b..2e32ad198f 100644
--- a/plugins/FBConnect/FBConnectPlugin.php
+++ b/plugins/FBConnect/FBConnectPlugin.php
@@ -122,7 +122,9 @@ class FBConnectPlugin extends Plugin
                                     FB_RequireFeatures(
                                         ["XFBML"],
                                             function() {
-                                                FB.Facebook.init("%s", "../xd_receiver.html");
+                                                FB.init("%s", "../xd_receiver.html",
+                                                 {"doNotUseCachedConnectState":true });
+
                                             }
                                         ); }
 
@@ -220,11 +222,11 @@ class FBConnectPlugin extends Plugin
                 try {
 
                     $facebook = getFacebook();
-                    $fbuid    = getFacebook()->get_loggedin_user();
+                    $fbuid    = $facebook->api_client->users_getLoggedInUser();
 
                 } catch (Exception $e) {
                     common_log(LOG_WARNING,
-                        'Problem getting Facebook client: ' .
+                        'Problem getting Facebook user: ' .
                             $e->getMessage());
                 }
 
@@ -297,9 +299,9 @@ class FBConnectPlugin extends Plugin
                 $title =  _('Logout from the site');
                 $text = _('Logout');
 
-                $html = sprintf('<li id="nav_logout"><a href="%s" title="%s" ' .
-                    'onclick="FB.Connect.logout(function() { goto_logout() })">%s</a></li>',
-                    $logout_url, $title, $text);
+                $html = sprintf('<li id="nav_logout"><a href="#" title="%s" ' .
+                    'onclick="FB.Connect.logoutAndRedirect(\'%s\');">%s</a></li>',
+                    $title, $logout_url, $text);
 
                 $action->raw($html);