Type-hint is array here.

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

diff --git a/actions/microsummary.php b/actions/microsummary.php
index 2af640db07e7a1a82a331be1968a13d026872c01..03348617da9b1541b9094f1b85129dea234eda5b 100644 (file)
--- a/actions/microsummary.php
+++ b/actions/microsummary.php
@@ -6,10 +6,10 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -37,44 +37,45 @@ if (!defined('LACONICA')) {
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 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) {
-            $this->clientError(_('No such user'), 404);
-            return;
+            // TRANS: Client error displayed trying to make a micro summary without providing a valid user.
+            $this->clientError(_('No such user.'), 404);
         }
-        
+
         $notice = $user->getCurrentNotice();
-        
+
         if (!$notice) {
-            $this->clientError(_('No current status'), 404);
+            // 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;
     }