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

Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x

Browse Source
This commit is contained in:
Evan Prodromou 2009-11-09 17:46:48 -05:00
commit 18e61e631b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc-src/badge
View File

@ -1,4 +1,4 @@
Install the %%site.name%% badge on you blog or web site to show the latest updates Install the %%site.name%% badge on your blog or web site to show the latest updates
from you and your friends! from you and your friends!
<MTMarkdownOptions output='raw'> <MTMarkdownOptions output='raw'>

8
plugins/Realtime/RealtimePlugin.php
View File

@ -240,13 +240,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 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['url'] = $notice->bestUrl();
$arr['html'] = htmlspecialchars($notice->rendered); $arr['html'] = htmlspecialchars($notice->rendered);
$arr['source'] = htmlspecialchars($arr['source']); $arr['source'] = htmlspecialchars($arr['source']);