We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit f650b407 authored by Evan Prodromou's avatar Evan Prodromou

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

parents 5e31ecd8 c5153980
......@@ -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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment