GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Twitter bridge - fix for Ticket #2192

This commit is contained in:
Zach Copley 2010-02-17 20:53:16 +00:00
parent 6b887728b2
commit c498f6e1ba
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/TwitterBridge/twitter.php
View File

@ -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();

6
plugins/TwitterBridge/twitterauthorization.php
View File

@ -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;