GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.9.x' into 1.0.x

Browse Source 
Conflicts:
	lib/queuemanager.php
	lib/xmppmanager.php
	plugins/Xmpp/Fake_XMPP.php
	scripts/imdaemon.php
This commit is contained in:
Craig Andrews
2010-02-16 13:15:09 -05:00
parent 32084e33a2 d5cbfe8071
commit 20d6a7caed
55 changed files with 1719 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/imsenderqueuehandler.php
View File

@@ -25,10 +25,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
class ImSenderQueueHandler extends QueueHandler
{
function __construct($plugin, $immanager)
function __construct($plugin)
{
$this->plugin = $plugin;
$this->immanager = $immanager;
}
/**
@@ -38,7 +37,7 @@ class ImSenderQueueHandler extends QueueHandler
*/
function handle($data)
{
return $this->immanager->send_raw_message($data);
return $this->plugin->imManager->send_raw_message($data);
}
}