Merge branch '0.9.x' into schema

[quix0rs-gnu-social.git] / lib / xmppqueuehandler.php

diff --git a/lib/xmppqueuehandler.php b/lib/xmppqueuehandler.php
index 0ab837eb6563b7eed3f492b23d9d6410f9b78caa..f28fc9088c47b1449b91a0575f4656e43b3abf2e 100644 (file)
--- 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');