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

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

Browse Source
This commit is contained in:
Evan Prodromou 2010-01-27 16:37:43 -05:00
commit f650b40706
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/stompqueuemanager.php
View File

@ -178,7 +178,8 @@ class StompQueueManager extends QueueManager
$result = $this->con->send($this->queueName($queue), $result = $this->con->send($this->queueName($queue),
$msg, // BODY of the message $msg, // BODY of the message
array ('created' => common_sql_now())); array ('created' => common_sql_now(),
'persistent' => 'true'));
if (!$result) { if (!$result) {
common_log(LOG_ERR, "Error sending $rep to $queue queue"); common_log(LOG_ERR, "Error sending $rep to $queue queue");

2
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($script); $action->script(common_path($script));
} }
$user = common_current_user(); $user = common_current_user();