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

[quix0rs-gnu-social.git] / plugins / Bookmark / actions / apitimelinebookmarks.php

diff --git a/plugins/Bookmark/actions/apitimelinebookmarks.php b/plugins/Bookmark/actions/apitimelinebookmarks.php
index 4cc0dcde7f74d2bacd549e43553aba338f804557..ac65722480e8166de9ecdcce05059f2ce48d892c 100644 (file)
--- a/plugins/Bookmark/actions/apitimelinebookmarks.php
+++ b/plugins/Bookmark/actions/apitimelinebookmarks.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * Show a user's favorite notices
+ * Show a user's bookmark activities
  *
  * PHP version 5
  *
@@ -35,7 +35,7 @@ if (!defined('STATUSNET')) {
 }
 
 /**
- * Returns the 20 most recent favorite notices for the authenticating user or user
+ * Returns the most recent bookmark activities for the authenticating user or user
  * specified by the ID parameter in the requested format.
  *
  * @category API
@@ -57,7 +57,7 @@ class ApiTimelineBookmarksAction extends ApiBareAuthAction
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -66,7 +66,6 @@ class ApiTimelineBookmarksAction extends ApiBareAuthAction
         if (empty($this->user)) {
             // TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
             $this->clientError(_('No such user.'), 404, $this->format);
-            return;
         }
 
         $this->notices = $this->getNotices();
@@ -83,7 +82,7 @@ class ApiTimelineBookmarksAction extends ApiBareAuthAction
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
         $this->showTimeline();
@@ -172,7 +171,6 @@ class ApiTimelineBookmarksAction extends ApiBareAuthAction
         default:
             // TRANS: Client error displayed when coming across a non-supported API method.
             $this->clientError(_('API method not found.'), $code = 404);
-            break;
         }
     }
 
@@ -209,7 +207,7 @@ class ApiTimelineBookmarksAction extends ApiBareAuthAction
      *
      * @return boolean true
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }