From f026ecec322e59899b5ce87abaa6d93738f67b9e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 27 Jan 2010 19:50:08 -0800
Subject: fix for fix for bad realtime JS load

---
 plugins/Realtime/RealtimePlugin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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)
-- 
cgit v1.2.3-54-g00ecf


From 644c319f5ad78dbedb686cdfef38152cadf615b2 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 27 Jan 2010 19:58:33 -0800
Subject: fix notice -- drop unused return value of variable that isn't
 initialized :) thx @ g0 for the catch

---
 classes/Notice.php | 2 --
 1 file changed, 2 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()
-- 
cgit v1.2.3-54-g00ecf


From 427ac3a3a6eafa9a82006e9f0a9c2ab19a09fb4b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 27 Jan 2010 20:51:04 -0800
Subject: debug log line for control channel sub

---
 lib/stompqueuemanager.php | 1 +
 1 file changed, 1 insertion(+)

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) {
-- 
cgit v1.2.3-54-g00ecf