X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fmicrosummary.php;h=2742eb9a048f8977dcc0e674949a25605826b490;hb=8892702f0cf84ca7b74ef8fdbb785e3155637c72;hp=b5cfb974eff75b7f274da181fb64952c77d1d3eb;hpb=d35b2d3f3c2128b147a6fa897032262c1f632262;p=quix0rs-gnu-social.git diff --git a/actions/microsummary.php b/actions/microsummary.php index b5cfb974ef..2742eb9a04 100644 --- a/actions/microsummary.php +++ b/actions/microsummary.php @@ -6,8 +6,8 @@ * * @category Action * @package StatusNet - * @author Evan Prodromou - * @author Robin Millette + * @author Evan Prodromou + * @author Robin Millette * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ * @@ -28,7 +28,7 @@ * along with this program. If not, see . */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } @@ -37,8 +37,8 @@ if (!defined('LACONICA')) { * * @category Action * @package StatusNet - * @author Evan Prodromou - * @author Robin Millette + * @author Evan Prodromou + * @author Robin Millette * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ */ @@ -46,7 +46,7 @@ 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; }