summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-02-17 20:53:16 +0000
committerZach Copley <zach@status.net>2010-02-17 20:58:32 +0000
commit73ba26efe3d9d97c478a507d351ac92d28d82655 (patch)
treea3b0cb46ffc1989f16a3ab3d13d4595257a1ad5d
parent05c50499c31b80d2a1c41e5256fae96cc06252ad (diff)
Twitter bridge - fix for Ticket #2192
-rw-r--r--plugins/TwitterBridge/twitter.php14
-rw-r--r--plugins/TwitterBridge/twitterauthorization.php6
2 files changed, 12 insertions, 8 deletions
diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php
index e5afde62c..ceb83b037 100644
--- a/plugins/TwitterBridge/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
@@ -1,7 +1,7 @@
<?php
/*
* StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2010 StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -33,11 +33,15 @@ function add_twitter_user($twitter_id, $screen_name)
// repoed, and things like that.
$luser = Foreign_user::getForeignUser($twitter_id, TWITTER_SERVICE);
- $result = $luser->delete();
- if ($result != false) {
- common_log(LOG_INFO,
- "Twitter bridge - removed old Twitter user: $screen_name ($twitter_id).");
+ if (!empty($luser)) {
+ $result = $luser->delete();
+ if ($result != false) {
+ common_log(
+ LOG_INFO,
+ "Twitter bridge - removed old Twitter user: $screen_name ($twitter_id)."
+ );
+ }
}
$fuser = new Foreign_user();
diff --git a/plugins/TwitterBridge/twitterauthorization.php b/plugins/TwitterBridge/twitterauthorization.php
index 8bfdacee9..cabf69d7a 100644
--- a/plugins/TwitterBridge/twitterauthorization.php
+++ b/plugins/TwitterBridge/twitterauthorization.php
@@ -178,7 +178,7 @@ class TwitterauthorizationAction extends Action
);
common_log(LOG_INFO, 'Twitter bridge - ' . $msg);
$this->serverError(
- _m('Couldn\'t link your Twitter account: ') . $e->getMessage()
+ _m('Couldn\'t link your Twitter account.')
);
}
@@ -226,7 +226,7 @@ class TwitterauthorizationAction extends Action
);
common_log(LOG_INFO, 'Twitter bridge - ' . $msg);
$this->serverError(
- _m('Couldn\'t link your Twitter account: ') . $e-getMessage()
+ _m('Couldn\'t link your Twitter account.')
);
}
@@ -292,7 +292,7 @@ class TwitterauthorizationAction extends Action
if (empty($flink_id)) {
common_log_db_error($flink, 'INSERT', __FILE__);
- $this->serverError(_('Couldn\'t link your Twitter account.'));
+ $this->serverError(_('Couldn\'t link your Twitter account.'));
}
return $flink_id;