diff options
author | Zach Copley <zach@status.net> | 2010-03-05 02:27:01 +0000 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2010-03-05 03:55:39 +0000 |
commit | 6aac7cc6cd011b3c86f3f4c8e00a14f992a78306 (patch) | |
tree | 6dcc1f2a85658341ccef0a199a4e1032c003b19a /plugins/TwitterBridge/twitterauthorization.php | |
parent | 5e60bf2ca65f5e862fa1741e42d35e2ae7bb5559 (diff) |
Fix for errant deletion of all Twitter foreign_links
Diffstat (limited to 'plugins/TwitterBridge/twitterauthorization.php')
-rw-r--r-- | plugins/TwitterBridge/twitterauthorization.php | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/plugins/TwitterBridge/twitterauthorization.php b/plugins/TwitterBridge/twitterauthorization.php index cabf69d7a..bce679622 100644 --- a/plugins/TwitterBridge/twitterauthorization.php +++ b/plugins/TwitterBridge/twitterauthorization.php @@ -273,7 +273,13 @@ class TwitterauthorizationAction extends Action $flink->user_id = $user_id; $flink->service = TWITTER_SERVICE; - $flink->delete(); // delete stale flink, if any + + // delete stale flink, if any + $result = $flink->find(true); + + if (!empty($result)) { + $flink->delete(); + } $flink->user_id = $user_id; $flink->foreign_id = $twuid; @@ -455,6 +461,11 @@ class TwitterauthorizationAction extends Action $user = User::register($args); + if (empty($user)) { + $this->serverError(_('Error registering user.')); + return; + } + $result = $this->saveForeignLink($user->id, $this->twuid, $this->access_token); |