diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-07-02 08:22:09 -0400 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-07-02 08:22:09 -0400 |
commit | d04ab14a5a15f9119bedca1332eb516ecf5ca483 (patch) | |
tree | ad7fdf3b4a585c5d97bcac44b01ba2fbb8887b97 /plugins/FBConnect/FBConnectAuth.php | |
parent | aea546c12234e9b24abba8da5d172a99e8b93ac2 (diff) | |
parent | 734f631e1ea9022c6de492e0d2979c9ca00585a4 (diff) |
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
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)"); |