Partly revert 97830b07019d9ffe33e2c2048bac39026e636998 (thanks _MrB_)

require_once lines were required since _plugins_ don't __autoload

Also, Realtime would load the wrong URL for css/js since $this->name()
returns get_class($this) instead of the calling class' __CLASS__.

diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php
index 22f791e2fccb032270458eb27d970fc348a63d2c..d669626a67d30611d976782fbb15f666a67e77e8 100644 (file)
--- a/plugins/Comet/CometPlugin.php
+++ b/plugins/Comet/CometPlugin.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 Comet
  *

diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php
index b495fcddd94a54f242664ff3ceca0092c0a5e149..881dfdc1b3daadb627cc71b60bdb2bc001d8d625 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
  *

diff --git a/plugins/Orbited/OrbitedPlugin.php b/plugins/Orbited/OrbitedPlugin.php
index 6267b38f7eefab0783e4442b0264eeebffbb2f90..e788c464e605f42b36d90f3fa9578ad774d13f97 100644 (file)
--- a/plugins/Orbited/OrbitedPlugin.php
+++ b/plugins/Orbited/OrbitedPlugin.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 Orbited + STOMP
  *

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 138ed4dc7aa7a38b56336921a9bd41d82b9b4d72..69182b14fe242d515cce144eec8cad09531d5c92 100644 (file)
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -142,7 +142,7 @@ class RealtimePlugin extends Plugin
 
     public function onEndShowStylesheets(Action $action)
     {
-        $action->cssLink($this->path('css/realtimeupdate.css'),
+        $action->cssLink(self::staticPath(__CLASS__, 'css/realtimeupdate.css'),
                          null,
                          'screen, projection, tv');
         return true;
@@ -391,7 +391,7 @@ class RealtimePlugin extends Plugin
 
     function _getScripts()
     {
-        return array($this->path('js/realtimeupdate.js'));
+        return array(self::staticPath(__CLASS__, 'js/realtimeupdate.js'));
     }
 
     /**