diff options
author | Evan Prodromou <evan@status.net> | 2010-01-31 15:27:58 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-01-31 15:27:58 -0500 |
commit | 779204b194447397d0770d96e291d9491fd731b9 (patch) | |
tree | d0bfe36cc2b743fce8507e8cf6851467ccec8789 /plugins/Realtime/RealtimePlugin.php | |
parent | bd5278302574ae3af87f09e0d8191c95ab93582a (diff) | |
parent | 81087e45c5b797028e90181459e4c673cd7be278 (diff) |
Merge branch 'testing' into 0.9.x
Conflicts:
actions/apioauthauthorize.php
Diffstat (limited to 'plugins/Realtime/RealtimePlugin.php')
-rw-r--r-- | plugins/Realtime/RealtimePlugin.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 16e28e94d..6c212453e 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -87,7 +87,7 @@ class RealtimePlugin extends Plugin $scripts = $this->_getScripts(); foreach ($scripts as $script) { - $action->script(common_path($script)); + $action->script($script); } $user = common_current_user(); @@ -307,7 +307,7 @@ class RealtimePlugin extends Plugin function _getScripts() { - return array('plugins/Realtime/realtimeupdate.js'); + return array(common_path('plugins/Realtime/realtimeupdate.js')); } function _updateInitialize($timeline, $user_id) |