diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-27 16:37:43 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-27 16:37:43 -0500 |
| commit | f650b40706bc3ecf0944a2e64cb30eeaf3728659 (patch) | |
| tree | ec2eb083105398f21dc66237ec6216728c360f9e | |
| parent | 5e31ecd82aaf102382380b1352503303893cf9ba (diff) | |
| parent | c51539804a7f6f63b3f47fd838b9527262440e3d (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
| -rw-r--r-- | lib/stompqueuemanager.php | 3 | ||||
| -rw-r--r-- | plugins/Realtime/RealtimePlugin.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php index 89f3d74cc..19e8c49b5 100644 --- a/lib/stompqueuemanager.php +++ b/lib/stompqueuemanager.php @@ -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"); diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 89640f5be..16e28e94d 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -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(); |