Merge branch 'master' of https://git.gnu.io/aroque/gnu-social into social-master

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

diff --git a/actions/userbyid.php b/actions/userbyid.php
index f3e1556f3f143da067a6d259587b8e8edf493e47..27b6b7bb5b684084b693dd750ec1fa198eb02aad 100644 (file)
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * User by ID action class.
  *
@@ -50,7 +49,7 @@ class UserbyidAction extends Action
      *
      * @return boolean true
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }
@@ -62,15 +61,17 @@ class UserbyidAction extends Action
      *
      * @return nothing
      */
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
         $id = $this->trimmed('id');
         if (!$id) {
+            // TRANS: Client error displayed trying to find a user by ID without providing an ID.
             $this->clientError(_('No ID.'));
         }
-        $user = User::staticGet($id);
+        $user = User::getKV($id);
         if (!$user) {
+            // TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
             $this->clientError(_('No such user.'));
         }