Merge branch 'master' into testing

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

diff --git a/lib/groupdesignaction.php b/lib/groupdesignaction.php
index 1a4f7d01dc4ec1ff4cd9e164b8f117efc40f44a8..3eb3964e87fa393361b68dfc0f3ff72ffe354653 100644 (file)
--- a/lib/groupdesignaction.php
+++ b/lib/groupdesignaction.php
@@ -21,13 +21,13 @@
  *
  * @category  Action
  * @package   StatusNet
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 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);
 }
 
@@ -39,9 +39,9 @@ if (!defined('LACONICA')) {
  *
  * @category Action
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @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/
  *
  */
 class GroupDesignAction extends Action {