ShowprofiletagAction now extends ShowstreamAction

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

diff --git a/actions/microsummary.php b/actions/microsummary.php
index 6884a919a89eb82a343183c4c8e8844be2c96d40..2742eb9a048f8977dcc0e674949a25605826b490 100644 (file)
--- a/actions/microsummary.php
+++ b/actions/microsummary.php
@@ -5,14 +5,14 @@
  * PHP version 5
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @package  StatusNet
+ * @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/
  *
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, Control Yourself, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -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);
 }
 
@@ -36,17 +36,17 @@ if (!defined('LACONICA')) {
  * Microsummary action class.
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @package  StatusNet
+ * @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
@@ -56,21 +56,22 @@ class MicrosummaryAction extends Action
         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;
     }