Merge branch '1.0.x' into 1.1.x

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

diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php
index 3f963eb7328ec95952af05a2667b1ca19b00a533..1cff453d61fff3c515404608667e737449d50e46 100644 (file)
--- a/plugins/Meteor/MeteorPlugin.php
+++ b/plugins/Meteor/MeteorPlugin.php
@@ -103,7 +103,11 @@ class MeteorPlugin extends RealtimePlugin
     function _updateInitialize($timeline, $user_id)
     {
         $script = parent::_updateInitialize($timeline, $user_id);
-        return $script." MeteorUpdater.init(\"$this->webserver\", $this->webport, \"{$timeline}\");";
+        $ours = sprintf("MeteorUpdater.init(%s, %s, %s);",
+                                       json_encode($this->webserver),
+                                       json_encode($this->webport),
+                                       json_encode($timeline));
+        return $script." ".$ours;
     }
 
     function _connect()