diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-09-08 16:02:57 -0700 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-09-08 16:02:57 -0700 |
| commit | 9d87313eaebe8240393ac300a435f3b1332c8849 (patch) | |
| tree | 6b7e7d69c63fc6801ad95477be9c11ccb7cd0a1a /actions/opensearch.php | |
| parent | 5efe588174c71979fc1970353c9a556ea441f138 (diff) | |
| parent | beae3db41375879e725af053edf8041bbd76ac8c (diff) | |
Merge branch '0.9.x' into pluginize-twitter-bridge
Conflicts:
plugins/TwitterBridge/twitterauthorization.php
Diffstat (limited to 'actions/opensearch.php')
| -rw-r--r-- | actions/opensearch.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/actions/opensearch.php b/actions/opensearch.php index 6044568f1..d5e6698f3 100644 --- a/actions/opensearch.php +++ b/actions/opensearch.php @@ -6,14 +6,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 @@ -29,7 +29,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } @@ -39,11 +39,11 @@ if (!defined('LACONICA')) { * Formatting of RSS handled by Rss10Action * * @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 OpensearchAction extends Action { |