Merge branch 'nightly' of gitorious.org:social/mainline into nightly

[quix0rs-gnu-social.git] / plugins / Meteor / MeteorPlugin.php

diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php
index b495fcddd94a54f242664ff3ceca0092c0a5e149..64c2fd3d6902b39e3c36e89a683ce3c6fae02ba4 100644 (file)
--- a/plugins/Meteor/MeteorPlugin.php
+++ b/plugins/Meteor/MeteorPlugin.php
@@ -31,6 +31,8 @@ if (!defined('GNUSOCIAL') && !defined('STATUSNET')) {
     exit(1);
 }
 
+require_once INSTALLDIR.'/plugins/Realtime/RealtimePlugin.php';
+
 /**
  * Plugin to do realtime updates using Meteor
  *
@@ -101,10 +103,11 @@ class MeteorPlugin extends RealtimePlugin
     function _updateInitialize($timeline, $user_id)
     {
         $script = parent::_updateInitialize($timeline, $user_id);
-        $ours = sprintf("MeteorUpdater.init(%s, %s, %s);",
-                                       json_encode($this->webserver),
-                                       json_encode($this->webport),
-                                       json_encode($timeline));
+        $ours = sprintf("MeteorUpdater.init(%s, %s, %s, %s);",
+                        json_encode($this->webserver),
+                        json_encode($this->webport),
+                        json_encode($this->protocol),
+                        json_encode($timeline));
         return $script." ".$ours;
     }
 
@@ -157,7 +160,7 @@ class MeteorPlugin extends RealtimePlugin
         return implode('-', $path);
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Meteor',
                             'version' => GNUSOCIAL_VERSION,