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

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

diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php
index 1eb7341ef0fb9d2a47a251598af0e8743e7c7443..5dca9a42cd19d9536a5141556c1d007543ffb805 100644 (file)
--- a/actions/apitimelinehome.php
+++ b/actions/apitimelinehome.php
@@ -65,7 +65,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction
      *
      * @return boolean success flag
      */
-    protected function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -178,7 +178,7 @@ class ApiTimelineHomeAction 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,
@@ -199,7 +199,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction
      *
      * @return boolean true
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }