forked from GNUsocial/gnu-social
Twitter bridge - fix for Ticket #2192
This commit is contained in:
parent
05c50499c3
commit
73ba26efe3
@ -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 (!empty($luser)) {
|
||||
$result = $luser->delete();
|
||||
if ($result != false) {
|
||||
common_log(LOG_INFO,
|
||||
"Twitter bridge - removed old Twitter user: $screen_name ($twitter_id).");
|
||||
common_log(
|
||||
LOG_INFO,
|
||||
"Twitter bridge - removed old Twitter user: $screen_name ($twitter_id)."
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
$fuser = new Foreign_user();
|
||||
|
@ -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.')
|
||||
);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user