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

diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index 89f3d74cce0e7fb6628552c6538a0a758760ac2d..19e8c49b5ce9c9e7a996ef3f8d948a9360b8f952 100644 (file)
--- 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 89640f5beb25c7e41db6c4a3dceeb2569fa326cb..16e28e94d3eed57718c63e9efdd6de916ec0845f 100644 (file)
--- 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();