diff options
author | Zach Copley <zach@controlyourself.ca> | 2009-07-01 16:25:38 -0700 |
---|---|---|
committer | Zach Copley <zach@controlyourself.ca> | 2009-07-01 16:25:38 -0700 |
commit | 6bc37a3254f814b6bece4a62fed4fc27f785f0bb (patch) | |
tree | 37792ec16e9d529266e1884d11d1030cfd916d66 /plugins/FBConnect/FBConnectAuth.php | |
parent | 0e78e1cc52674e94361aa3351bdad54894b17eb2 (diff) | |
parent | e39b2378beabff73ec2bcfc602d6811d7787523d (diff) |
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/dev:
Removed extra slash
Killed the FB Connect profile-pic bounce in all browsers
Diffstat (limited to 'plugins/FBConnect/FBConnectAuth.php')
-rw-r--r-- | plugins/FBConnect/FBConnectAuth.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/FBConnect/FBConnectAuth.php b/plugins/FBConnect/FBConnectAuth.php index 4699ce636..3cf9fefc1 100644 --- a/plugins/FBConnect/FBConnectAuth.php +++ b/plugins/FBConnect/FBConnectAuth.php @@ -66,7 +66,7 @@ class FBConnectauthAction extends Action // User is already logged in. Does she already have a linked Facebook acct? $flink = Foreign_link::getByForeignID($this->fbuid, FACEBOOK_CONNECT_SERVICE); - if ($flink) { + if (!empty($flink)) { // User already has a linked Facebook account and shouldn't be here common_debug('There is already a local user (' . $flink->user_id . @@ -337,7 +337,7 @@ class FBConnectauthAction extends Action if ($flink) { $user = $flink->getUser(); - if ($user) { + if (!empty($user)) { common_debug("Logged in Facebook user $flink->foreign_id as user $user->id ($user->nickname)"); |