forked from GNUsocial/gnu-social
Fix three fatal errors when posting from 0.9.x:
* OMB remote updates were trying to load nonexistent Laconica_OMB_Service_Consumer class -- fixed to StatusNet_OMB_Service_Consumer. Regression caused during libomb merge. * Twitter processing was still being queued from core when no twitter plugin was present, which triggered an exception from UnqueueHandler; leftover code from before the plugin extraction. * UnqueueHandler's exception caused a fatal error instead because it was missing the "new" keyword. Wouldn't have been seen when testing with the plugin enabled.
This commit is contained in:
parent
c93b9b9523
commit
b89878511f
@ -87,7 +87,7 @@ function omb_broadcast_notice($notice)
|
|||||||
common_debug('Posting to ' . $rp->postnoticeurl, __FILE__);
|
common_debug('Posting to ' . $rp->postnoticeurl, __FILE__);
|
||||||
|
|
||||||
/* Post notice. */
|
/* Post notice. */
|
||||||
$service = new Laconica_OMB_Service_Consumer(
|
$service = new StatusNet_OMB_Service_Consumer(
|
||||||
array(OMB_ENDPOINT_POSTNOTICE => $rp->postnoticeurl));
|
array(OMB_ENDPOINT_POSTNOTICE => $rp->postnoticeurl));
|
||||||
try {
|
try {
|
||||||
$service->setToken($rp->token, $rp->secret);
|
$service->setToken($rp->token, $rp->secret);
|
||||||
|
@ -72,7 +72,7 @@ class UnQueueManager
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (Event::handle('UnqueueHandleNotice', array(&$notice, $queue))) {
|
if (Event::handle('UnqueueHandleNotice', array(&$notice, $queue))) {
|
||||||
throw ServerException("UnQueueManager: Unknown queue: $queue");
|
throw new ServerException("UnQueueManager: Unknown queue: $queue");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -906,7 +906,6 @@ function common_broadcast_notice($notice, $remote=false)
|
|||||||
function common_enqueue_notice($notice)
|
function common_enqueue_notice($notice)
|
||||||
{
|
{
|
||||||
static $localTransports = array('omb',
|
static $localTransports = array('omb',
|
||||||
'twitter',
|
|
||||||
'facebook',
|
'facebook',
|
||||||
'ping');
|
'ping');
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user