diff options
| author | Evan Prodromou <evan@status.net> | 2009-08-27 11:16:45 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-08-27 11:16:45 -0700 |
| commit | 5d09b6b3f0595540c66b703ae085f0af904fe30f (patch) | |
| tree | 59269a4dacf90bbab9f0ff63afff4bf1781a1240 /actions/block.php | |
| parent | f1fda6c0503e32edfc99b297f4bf2cb07e629d9e (diff) | |
| parent | 82b0927f5838f3c12816e03712df9460a9f77b72 (diff) | |
Merge branch '0.8.x' into 0.9.x
Conflicts:
EVENTS.txt
actions/finishremotesubscribe.php
actions/postnotice.php
actions/public.php
actions/remotesubscribe.php
actions/showstream.php
actions/updateprofile.php
actions/userauthorization.php
classes/laconica.ini
lib/common.php
lib/oauthstore.php
lib/omb.php
Diffstat (limited to 'actions/block.php')
| -rw-r--r-- | actions/block.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/actions/block.php b/actions/block.php index 06f92254e..408f16434 100644 --- a/actions/block.php +++ b/actions/block.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,11 +36,11 @@ if (!defined('LACONICA')) { * Block a user 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 BlockAction extends Action { |