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

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

diff --git a/actions/microsummary.php b/actions/microsummary.php
index d145dc3bc7b0bc724ba7ae087148131e4415589d..03348617da9b1541b9094f1b85129dea234eda5b 100644 (file)
--- a/actions/microsummary.php
+++ b/actions/microsummary.php
@@ -46,35 +46,36 @@ class MicrosummaryAction extends Action
 {
     /**
      * Class handler.
-     * 
+     *
      * @param array $args array of arguments
      *
      * @return nothing
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
         $nickname = common_canonical_nickname($this->arg('nickname'));
-        $user     = User::staticGet('nickname', $nickname);
+        $user     = User::getKV('nickname', $nickname);
 
         if (!$user) {
+            // TRANS: Client error displayed trying to make a micro summary without providing a valid user.
             $this->clientError(_('No such user.'), 404);
-            return;
         }
-        
+
         $notice = $user->getCurrentNotice();
-        
+
         if (!$notice) {
+            // TRANS: Client error displayed trying to make a micro summary without providing a status.
             $this->clientError(_('No current status.'), 404);
         }
-        
+
         header('Content-Type: text/plain');
-        
+
         print $user->nickname . ': ' . $notice->content;
     }
 
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }