Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

[quix0rs-gnu-social.git] / actions / imsettings.php

diff --git a/actions/imsettings.php b/actions/imsettings.php
index bfad8eaf9f5394fcbb73ee39e26b6420c7d9b6e5..f57933b43f28473ac4bca190559df4ccf29c1698 100644 (file)
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -21,13 +21,13 @@
  *
  * @category  Settings
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@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://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -39,7 +39,7 @@ require_once INSTALLDIR.'/lib/jabber.php';
  *
  * @category Settings
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *