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 /lib/xmppqueuehandler.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 'lib/xmppqueuehandler.php')
| -rw-r--r-- | lib/xmppqueuehandler.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/xmppqueuehandler.php b/lib/xmppqueuehandler.php index 0ab837eb6..f28fc9088 100644 --- a/lib/xmppqueuehandler.php +++ b/lib/xmppqueuehandler.php @@ -1,7 +1,7 @@ <?php /* - * 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 @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -if (!defined('LACONICA')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/queuehandler.php'); |