merge from testing

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

diff --git a/actions/groups.php b/actions/groups.php
index e862428fce2c46c19bc6a2027a08a102e163f3a1..10a1d5964d374ac2d18118223b3f297ca5211ed5 100644 (file)
--- a/actions/groups.php
+++ b/actions/groups.php
@@ -21,14 +21,14 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@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);
 }
 
@@ -41,7 +41,7 @@ require_once INSTALLDIR.'/lib/grouplist.php';
  *
  * @category Personal
  * @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/
  */