summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2009-10-23 23:05:59 +0000
committerZach Copley <zach@status.net>2009-10-23 23:05:59 +0000
commit34a21e76054ad3bfa11a5f790ce983645f651a54 (patch)
tree58b341c3b5ace018aabecfd39ebcfe932147c9e0 /lib
parent62ba25f53aaff0cbeb248b10bb2ed45dfbd2b671 (diff)
parentff4f9d8c7d6d1d5c4a69d75924e4da67a883db44 (diff)
Merge branch '0.9.x' into facebook-app-plugin
Diffstat (limited to 'lib')
-rw-r--r--lib/omb.php2
-rw-r--r--lib/unqueuemanager.php2
-rw-r--r--lib/util.php1
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 cef9a6588..72dbc4eed 100644
--- a/lib/unqueuemanager.php
+++ b/lib/unqueuemanager.php
@@ -66,7 +66,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');