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.

diff --git a/lib/omb.php b/lib/omb.php
index 0566701ff16990fbc45b6e3003b6e4f67455c5f7..cd6d6e1b259162c4f76aa61ba473cbe8f2d23880 100644 (file)
--- 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 51261bcd712cc3a03852c1fcf2c81a58e535cae0..6c26fac0ed9cc61a05812f719ad9e232fb8d1b9d 100644 (file)
--- 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 e641afd4db69a537df3465f2a709c025aa941ef3..55ded7dd4e5a004b1dc7380a497758469d831912 100644 (file)
--- 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');