From e00f433314722520871b0d42645909929223a662 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 30 Jun 2009 01:54:08 +0000 Subject: [PATCH] Only use FB's Javascript logout, not its PHP method too --- plugins/FBConnect/FBConnectPlugin.php | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/plugins/FBConnect/FBConnectPlugin.php b/plugins/FBConnect/FBConnectPlugin.php index 3a4f0dbe3a..459a802828 100644 --- a/plugins/FBConnect/FBConnectPlugin.php +++ b/plugins/FBConnect/FBConnectPlugin.php @@ -287,23 +287,13 @@ class FBConnectPlugin extends Plugin function onStartLogout($action) { - $user = common_current_user(); - - $flink = Foreign_link::getByUserId($user->id, FACEBOOK_CONNECT_SERVICE); - $action->logout(); + $fbuid = $this->loggedIn(); - if ($flink) { - - $facebook = getFacebook(); - + if (!empty($fbuid)) { try { - $fbuid = $facebook->get_loggedin_user(); - - if ($fbuid > 0) { - $facebook->logout(common_local_url('public')); - } - + $facebook = getFacebook(); + $facebook->expire_session(); } catch (Exception $e) { common_log(LOG_WARNING, 'Could\'t logout of Facebook: ' . $e->getMessage()); -- 2.39.5