Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

diff --git a/plugins/FacebookBridge/actions/facebookfinishlogin.php b/plugins/FacebookBridge/actions/facebookfinishlogin.php
index 4c8c9f860f2394104e4815032015c4926ceddbfa..2703ab85542a08fd8cf222ebedfd403e0cd776bc 100644 (file)
--- a/plugins/FacebookBridge/actions/facebookfinishlogin.php
+++ b/plugins/FacebookBridge/actions/facebookfinishlogin.php
@@ -44,10 +44,11 @@ class FacebookfinishloginAction extends Action
 
         if (isset($_COOKIE['fb_access_token'])) {
             $this->accessToken = $_COOKIE['fb_access_token'];
-            if (empty($this->accessToken)) {
-                $this->clientError(_m("Unable to authenticate you with Facebook."));
-                return false;
-            }
+        }
+
+        if (empty($this->accessToken)) {
+            $this->clientError(_m("Unable to authenticate you with Facebook."));
+            return false;
         }
 
         $graphUrl = 'https://graph.facebook.com/me?access_token=' . urlencode($this->accessToken);