summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-28 01:25:08 -0500
committerEvan Prodromou <evan@status.net>2010-01-28 01:25:08 -0500
commit5bf4928db81ad8fbb0eff425951e703d7ebc3677 (patch)
tree1f6312ca341eb6b93323cb3ce5f1f6a8f28fe735
parent1ba8045a9b318fd19fb55d2c469bd23a3976c2e8 (diff)
parent427ac3a3a6eafa9a82006e9f0a9c2ab19a09fb4b (diff)
Merge branch 'master' of git@gitorious.org:statusnet/mainline
-rw-r--r--classes/Notice.php2
-rw-r--r--lib/stompqueuemanager.php1
-rw-r--r--plugins/Realtime/RealtimePlugin.php4
3 files changed, 3 insertions, 4 deletions
diff --git a/classes/Notice.php b/classes/Notice.php
index 6b364fb5c..90e3e76ef 100644
--- 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 19e8c49b5..da70d9ae3 100644
--- 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 16e28e94d..6c212453e 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(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)