diff options
| author | Brion Vibber <brion@pobox.com> | 2009-10-23 20:31:53 +0000 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2009-10-23 20:31:53 +0000 |
| commit | b89878511f1f30b4e18858940a5468b8999ab7ea (patch) | |
| tree | b4e9b7abdcfd62275cc1fd40a5512c82e3821409 | |
| parent | c93b9b9523d64f29e5d2d9885febd0ac4c167a20 (diff) | |
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.
| -rw-r--r-- | lib/omb.php | 2 | ||||
| -rw-r--r-- | lib/unqueuemanager.php | 2 | ||||
| -rw-r--r-- | lib/util.php | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/lib/omb.php b/lib/omb.php index 0566701ff..cd6d6e1b2 100644 --- a/lib/omb.php +++ b/lib/omb.php @@ -87,7 +87,7 @@ function omb_broadcast_notice($notice) common_debug('Posting to ' . $rp->postnoticeurl, __FILE__); /* Post notice. */ - $service = new Laconica_OMB_Service_Consumer( + $service = new StatusNet_OMB_Service_Consumer( array(OMB_ENDPOINT_POSTNOTICE => $rp->postnoticeurl)); try { $service->setToken($rp->token, $rp->secret); diff --git a/lib/unqueuemanager.php b/lib/unqueuemanager.php index 51261bcd7..6c26fac0e 100644 --- a/lib/unqueuemanager.php +++ b/lib/unqueuemanager.php @@ -72,7 +72,7 @@ class UnQueueManager break; default: if (Event::handle('UnqueueHandleNotice', array(&$notice, $queue))) { - throw ServerException("UnQueueManager: Unknown queue: $queue"); + throw new ServerException("UnQueueManager: Unknown queue: $queue"); } } } diff --git a/lib/util.php b/lib/util.php index e641afd4d..55ded7dd4 100644 --- a/lib/util.php +++ b/lib/util.php @@ -906,7 +906,6 @@ function common_broadcast_notice($notice, $remote=false) function common_enqueue_notice($notice) { static $localTransports = array('omb', - 'twitter', 'facebook', 'ping'); |