Partly revert 97830b07019d9ffe33e2c2048bac39026e636998 (thanks _MrB_)

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

diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php
index 3f963eb7328ec95952af05a2667b1ca19b00a533..881dfdc1b3daadb627cc71b60bdb2bc001d8d625 100644 (file)
--- a/plugins/Meteor/MeteorPlugin.php
+++ b/plugins/Meteor/MeteorPlugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
+if (!defined('GNUSOCIAL') && !defined('STATUSNET')) {
     exit(1);
 }
 
@@ -96,14 +96,18 @@ class MeteorPlugin extends RealtimePlugin
         } else {
                $scripts[] = 'http://'.$this->webserver.(($this->webport == 80) ? '':':'.$this->webport).'/meteor.js';
         }
-        $scripts[] = $this->path('meteorupdater.min.js');
+        $scripts[] = $this->path('js/meteorupdater.js');
         return $scripts;
     }
 
     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()
@@ -158,7 +162,7 @@ class MeteorPlugin extends RealtimePlugin
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'Meteor',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'http://status.net/wiki/Plugin:Meteor',
                             'rawdescription' =>