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

Merge branch 'master' of git@gitorious.org:statusnet/mainline

Browse Source
This commit is contained in:
Evan Prodromou 2010-01-28 01:25:08 -05:00
commit 5bf4928db8
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Notice.php
View File

@ -1378,8 +1378,6 @@ class Notice extends Memcached_DataObject
} }
$reply->free(); $reply->free();
return $ids;
} }
function clearRepeats() function clearRepeats()

1
lib/stompqueuemanager.php
View File

@ -242,6 +242,7 @@ class StompQueueManager extends QueueManager
parent::start($master); parent::start($master);
$this->_connect(); $this->_connect();
common_log(LOG_INFO, "Subscribing to $this->control");
$this->con->subscribe($this->control); $this->con->subscribe($this->control);
if ($this->sites) { if ($this->sites) {
foreach ($this->sites as $server) { foreach ($this->sites as $server) {

4
plugins/Realtime/RealtimePlugin.php
View File

@ -87,7 +87,7 @@ class RealtimePlugin extends Plugin
$scripts = $this->_getScripts(); $scripts = $this->_getScripts();
foreach ($scripts as $script) { foreach ($scripts as $script) {
$action->script(common_path($script)); $action->script($script);
} }
$user = common_current_user(); $user = common_current_user();
@ -307,7 +307,7 @@ class RealtimePlugin extends Plugin
function _getScripts() function _getScripts()
{ {
return array('plugins/Realtime/realtimeupdate.js'); return array(common_path('plugins/Realtime/realtimeupdate.js'));
} }
function _updateInitialize($timeline, $user_id) function _updateInitialize($timeline, $user_id)