diff options
Diffstat (limited to 'plugins/Realtime/RealtimePlugin.php')
| -rw-r--r-- | plugins/Realtime/RealtimePlugin.php | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index c5fb6de03..198cb5ad7 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -139,8 +139,8 @@ class RealtimePlugin extends Plugin // Add to the public timeline - if ($notice->is_local || - ($notice->is_local == 0 && !common_config('public', 'localonly'))) { + if ($notice->is_local == Notice::LOCAL_PUBLIC || + ($notice->is_local == Notice::REMOTE_OMB && !common_config('public', 'localonly'))) { $paths[] = array('public'); } @@ -237,7 +237,6 @@ class RealtimePlugin extends Plugin } $action->showContentBlock(); - $action->showScripts(); $action->elementEnd('body'); return false; // No default processing } @@ -247,13 +246,13 @@ class RealtimePlugin extends Plugin // FIXME: this code should be abstracted to a neutral third // party, like Notice::asJson(). I'm not sure of the ethics // of refactoring from within a plugin, so I'm just abusing - // the ApiAction method. Don't do this unless you're me! + // the TwitterApiAction method. Don't do this unless you're me! - require_once(INSTALLDIR.'/lib/api.php'); + require_once(INSTALLDIR.'/lib/twitterapi.php'); - $act = new ApiAction('/dev/null'); + $act = new TwitterApiAction('/dev/null'); - $arr = $act->twitterStatusArray($notice, true); + $arr = $act->twitter_status_array($notice, true); $arr['url'] = $notice->bestUrl(); $arr['html'] = htmlspecialchars($notice->rendered); $arr['source'] = htmlspecialchars($arr['source']); |