Merge branch 'firefox-sub-link' into 'master'

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

diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index cab9f37808c8311fa69569bc9a9c488adcd3af81..b14635ac33e5fcf6662d05f7d79f098639476317 100644 (file)
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -161,7 +161,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
      * @return boolean success flag
      *
      */
-    protected function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
         $this->target = $this->getTargetProfile($this->arg('id'));
@@ -274,7 +274,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
     {
         $notices = array();
 
-        $stream = new InboxNoticeStream($this->target->getUser(), $this->scoped);
+        $stream = new InboxNoticeStream($this->target, $this->scoped);
         
         $notice = $stream->getNotices(($this->page-1) * $this->count,
                                       $this->count,