Merge branch 'master' into 0.8.x

[quix0rs-gnu-social.git] / plugins / FBConnect / FBConnectPlugin.php

diff --git a/plugins/FBConnect/FBConnectPlugin.php b/plugins/FBConnect/FBConnectPlugin.php
index d8af1a4e86e58ff7493e8344574be923886c599b..2e32ad198fa20607ad042e4b2729b7a822ae8758 100644 (file)
--- 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);
 
@@ -313,8 +315,6 @@ class FBConnectPlugin extends Plugin
                  $action->menuItem(common_local_url('register'),
                      _('Register'), _('Create an account'), false, 'nav_register');
              }
-             $action->menuItem(common_local_url('openidlogin'),
-                 _('OpenID'), _('Login with OpenID'), false, 'nav_openid');
              $action->menuItem(common_local_url('login'),
                  _('Login'), _('Login to the site'), false, 'nav_login');
          }