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

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

diff --git a/actions/apitimelinelist.php b/actions/apitimelinelist.php
index fc61e7ce2dab6cb12a228934626043f3f42ad02d..75c9da034da347ad23a21628602d8eaeb741201d 100644 (file)
--- a/actions/apitimelinelist.php
+++ b/actions/apitimelinelist.php
@@ -66,7 +66,7 @@ class ApiTimelineListAction extends ApiPrivateAuthAction
      * @return boolean success flag
      *
      */
-    protected function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -199,7 +199,7 @@ class ApiTimelineListAction extends ApiPrivateAuthAction
      *
      * @return boolean true
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }