Merge branch 'master' into 1.0.x

Conflicts: lib/common.php
2011-08-02 15:04:14 -04:00
parent 5081c56ea4 6ce8134471
commit 513c54fa89
3 changed files with 33 additions and 46 deletions
--- 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()