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

2 files changed, 5 insertions, 5 deletions

diff --git a/doc-src/badge b/doc-src/badge
index 1c368eb69..5499e334c 100644
--- a/doc-src/badge
+++ b/doc-src/badge
@@ -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!
 
 <MTMarkdownOptions output='raw'>
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 0c7c1240c..181927968 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -240,13 +240,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']);