diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-10 16:33:36 -0400 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-10 16:33:36 -0400 |
commit | 6aee059033981cbf2499026a8697375fc7987a9e (patch) | |
tree | d70202ea44f1244249e15ecbaefa730b9b7ebdfb /plugins/FBConnect | |
parent | 65c37d66c83507b08284669a0b2413631ca55480 (diff) | |
parent | d0793c0f44aabb76af2556a690013c143ac9f7a3 (diff) |
Merge branch 'master' of git@gitorious.org:laconica/mainline
Diffstat (limited to 'plugins/FBConnect')
-rw-r--r-- | plugins/FBConnect/FBConnectPlugin.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/FBConnect/FBConnectPlugin.php b/plugins/FBConnect/FBConnectPlugin.php index 65870a187..6788793b2 100644 --- a/plugins/FBConnect/FBConnectPlugin.php +++ b/plugins/FBConnect/FBConnectPlugin.php @@ -122,7 +122,7 @@ class FBConnectPlugin extends Plugin FB_RequireFeatures( ["XFBML"], function() { - FB.Facebook.init("%s", "../xd_receiver.html"); + FB.init("%s", "../xd_receiver.html"); } ); } @@ -220,11 +220,11 @@ class FBConnectPlugin extends Plugin try { $facebook = getFacebook(); - $fbuid = getFacebook()->get_loggedin_user(); + $fbuid = $facebook->get_loggedin_user(); } catch (Exception $e) { common_log(LOG_WARNING, - 'Problem getting Facebook client: ' . + 'Problem getting Facebook user: ' . $e->getMessage()); } @@ -297,9 +297,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); |