Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
This commit is contained in:
commit
f650b40706
@ -178,7 +178,8 @@ class StompQueueManager extends QueueManager
|
||||
|
||||
$result = $this->con->send($this->queueName($queue),
|
||||
$msg, // BODY of the message
|
||||
array ('created' => common_sql_now()));
|
||||
array ('created' => common_sql_now(),
|
||||
'persistent' => 'true'));
|
||||
|
||||
if (!$result) {
|
||||
common_log(LOG_ERR, "Error sending $rep to $queue queue");
|
||||
|
@ -87,7 +87,7 @@ class RealtimePlugin extends Plugin
|
||||
$scripts = $this->_getScripts();
|
||||
|
||||
foreach ($scripts as $script) {
|
||||
$action->script($script);
|
||||
$action->script(common_path($script));
|
||||
}
|
||||
|
||||
$user = common_current_user();
|
||||
|
Loading…
Reference in New Issue
Block a user