Twitter bridge - fix for Ticket #2192

This commit is contained in:
Zach Copley 2010-02-17 20:53:16 +00:00
parent 4d97f83740
commit a80fdf3142
2 changed files with 11 additions and 7 deletions

View File

@ -33,11 +33,15 @@ function add_twitter_user($twitter_id, $screen_name)
// repoed, and things like that. // repoed, and things like that.
$luser = Foreign_user::getForeignUser($twitter_id, TWITTER_SERVICE); $luser = Foreign_user::getForeignUser($twitter_id, TWITTER_SERVICE);
$result = $luser->delete();
if (!empty($luser)) {
$result = $luser->delete();
if ($result != false) { if ($result != false) {
common_log(LOG_INFO, common_log(
"Twitter bridge - removed old Twitter user: $screen_name ($twitter_id)."); LOG_INFO,
"Twitter bridge - removed old Twitter user: $screen_name ($twitter_id)."
);
}
} }
$fuser = new Foreign_user(); $fuser = new Foreign_user();

View File

@ -178,7 +178,7 @@ class TwitterauthorizationAction extends Action
); );
common_log(LOG_INFO, 'Twitter bridge - ' . $msg); common_log(LOG_INFO, 'Twitter bridge - ' . $msg);
$this->serverError( $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); common_log(LOG_INFO, 'Twitter bridge - ' . $msg);
$this->serverError( $this->serverError(
_m('Couldn\'t link your Twitter account: ') . $e-getMessage() _m('Couldn\'t link your Twitter account.')
); );
} }