wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

These changes didn't go into master (from 0.9-release)

Browse Source
This commit is contained in:
Sarven Capadisli 2009-11-20 05:28:10 +00:00
parent 003b25ee56
commit c6e4feb815
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/Realtime/RealtimePlugin.php
View File

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