- Show Facebook profile pic and favicon as dictated by Facebook Connnect policy

- Logout fixed, again (cleans up Facebook cookies now)

1 files changed, 12 insertions, 2 deletions

diff --git a/plugins/FBConnect/FBConnectSettings.php b/plugins/FBConnect/FBConnectSettings.php
index b7831269c..7e255f43a 100644
--- a/plugins/FBConnect/FBConnectSettings.php
+++ b/plugins/FBConnect/FBConnectSettings.php
@@ -169,8 +169,18 @@ class FBConnectSettingsAction extends ConnectSettingsAction
                 return;
             }
 
-            $facebook = getFacebook();
-            $facebook->logout();
+            try {
+
+                // XXX: not sure what exactly to do here
+
+                $facebook = getFacebook();
+                $facebook->clear_cookie_state();
+
+            } catch (Exception $e) {
+                common_log(LOG_WARNING,
+                    'Couldn\'t clear Facebook cookies: ' .
+                        $e->getMessage());
+            }
 
             $this->showForm(_('Facebook user disconnected.'), true);