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

diff --git a/classes/Notice.php b/classes/Notice.php
index 6b364fb5ced82c1acd438489f0bd038d25f75a63..90e3e76ef33c471fd999a5cff5b54ae819bf8cd8 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1378,8 +1378,6 @@ class Notice extends Memcached_DataObject
         }
 
         $reply->free();
-
-        return $ids;
     }
 
     function clearRepeats()

diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index 19e8c49b5ce9c9e7a996ef3f8d948a9360b8f952..da70d9ae31e70296cc046b512c23d0aebab7f033 100644 (file)
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -242,6 +242,7 @@ class StompQueueManager extends QueueManager
         parent::start($master);
         $this->_connect();
 
+        common_log(LOG_INFO, "Subscribing to $this->control");
         $this->con->subscribe($this->control);
         if ($this->sites) {
             foreach ($this->sites as $server) {

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 16e28e94d3eed57718c63e9efdd6de916ec0845f..6c212453e4455d12499690e2d83b7b984d70c724 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(common_path($script));
+            $action->script($script);
         }
 
         $user = common_current_user();
@@ -307,7 +307,7 @@ class RealtimePlugin extends Plugin
 
     function _getScripts()
     {
-        return array('plugins/Realtime/realtimeupdate.js');
+        return array(common_path('plugins/Realtime/realtimeupdate.js'));
     }
 
     function _updateInitialize($timeline, $user_id)