diff options
| author | Evan Prodromou <evan@status.net> | 2009-10-02 15:27:55 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-10-02 15:27:55 -0400 |
| commit | b3b3af9a2eff10c272bb213eccd3dd3060bc5830 (patch) | |
| tree | ff0ae9108bcb085015a8e9f286963ad9fe58c13c /actions/twitapisearchjson.php | |
| parent | 51ac34e80c5a99008b1a945b2c00b6dbfdde1529 (diff) | |
| parent | 5309910b9b4dd2533ff5b2190f90bf415fd20113 (diff) | |
Merge branch '0.8.x' into deleteuser
Diffstat (limited to 'actions/twitapisearchjson.php')
| -rw-r--r-- | actions/twitapisearchjson.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/actions/twitapisearchjson.php b/actions/twitapisearchjson.php index 27a717bfc..c628ee624 100644 --- a/actions/twitapisearchjson.php +++ b/actions/twitapisearchjson.php @@ -1,6 +1,6 @@ <?php /** - * Laconica, the distributed open-source microblogging tool + * StatusNet, the distributed open-source microblogging tool * * Action for showing Twitter-like JSON search results * @@ -20,14 +20,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * * @category Search - * @package Laconica - * @author Zach Copley <zach@controlyourself.ca> - * @copyright 2008-2009 Control Yourself, Inc. + * @package StatusNet + * @author Zach Copley <zach@status.net> + * @copyright 2008-2009 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ + * @link http://status.net/ */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } @@ -38,10 +38,10 @@ require_once INSTALLDIR.'/lib/jsonsearchresultslist.php'; * Action handler for Twitter-compatible API search * * @category Search - * @package Laconica - * @author Zach Copley <zach@controlyourself.ca> + * @package StatusNet + * @author Zach Copley <zach@status.net> * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ + * @link http://status.net/ * @see TwitterapiAction */ |