summaryrefslogtreecommitdiff
path: root/plugins/TwitterBridge/twittersettings.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-10-12 11:16:14 -0400
committerEvan Prodromou <evan@status.net>2010-10-12 11:16:14 -0400
commitf11c1c77cab7d7310ec0d2c17bc6f35c491f2871 (patch)
tree7d0741b5d1b68cfbfa21ed974abab04e7b721b0b /plugins/TwitterBridge/twittersettings.php
parent1e3d5f80258811ce1c2154fcd971297e24264894 (diff)
parent1cd60579f5ac99a2c8bfb12d35093f5c74f14b04 (diff)
Merge remote branch 'gitorious/0.9.x' into 0.9.x
Diffstat (limited to 'plugins/TwitterBridge/twittersettings.php')
-rw-r--r--plugins/TwitterBridge/twittersettings.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/TwitterBridge/twittersettings.php b/plugins/TwitterBridge/twittersettings.php
index dab8ab34f..33c5eb65b 100644
--- a/plugins/TwitterBridge/twittersettings.php
+++ b/plugins/TwitterBridge/twittersettings.php
@@ -247,6 +247,11 @@ class TwittersettingsAction extends ConnectSettingsAction
$user = common_current_user();
$flink = Foreign_link::getByUserID($user->id, TWITTER_SERVICE);
+ if (empty($flink)) {
+ $this->clientError(_m('No Twitter connection to remove.'));
+ return;
+ }
+
$result = $flink->safeDelete();
if (empty($result)) {