Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 9a0221b1a2abc17f0550fa8a7bc4b6c5e83dc6fb..b809699c7f4d154d845452b78c413c85b64f1b9f 100644 (file)
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -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,
@@ -295,7 +295,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
      *
      * @return boolean true
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }