Merge branch 'master' of gitorious.org:social/mainline

[quix0rs-gnu-social.git] / actions / apitimelineretweetedtome.php

diff --git a/actions/apitimelineretweetedtome.php b/actions/apitimelineretweetedtome.php
index 628dc402474fa9137f540dda30acf436a121ac37..a3ffa7db3037a6262cb4678f067cdb146f72fad1 100644 (file)
--- a/actions/apitimelineretweetedtome.php
+++ b/actions/apitimelineretweetedtome.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Show most recent notices that are repeats in user's inbox
  *
@@ -61,7 +59,7 @@ class ApiTimelineRetweetedToMeAction extends ApiAuthAction
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -85,7 +83,7 @@ class ApiTimelineRetweetedToMeAction extends ApiAuthAction
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
@@ -138,7 +136,7 @@ class ApiTimelineRetweetedToMeAction extends ApiAuthAction
 
             break;
         case 'as':
-            header('Content-Type: application/json; charset=utf-8');
+            header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
             $doc = new ActivityStreamJSONDocument($this->auth_user);
             $doc->setTitle($title);
             $doc->addLink($link, 'alternate', 'text/html');
@@ -146,7 +144,7 @@ class ApiTimelineRetweetedToMeAction extends ApiAuthAction
             $this->raw($doc->asString());
             break;
         default:
-            // TRANS: Client error displayed when trying to handle an unknown API method.
+            // TRANS: Client error displayed when coming across a non-supported API method.
             $this->clientError(_('API method not found.'), $code = 404);
             break;
         }
@@ -161,7 +159,7 @@ class ApiTimelineRetweetedToMeAction extends ApiAuthAction
      *
      * @return boolean is read only action?
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }