Merge branch 'testing' into 0.9.x

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

diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php
index 2fe06752e7d7e7f9970ceca034bae9ace19b2362..cb6a87515f9cdc86c001ce2985fccfbf627ae036 100644 (file)
--- a/lib/unsubscribeform.php
+++ b/lib/unsubscribeform.php
@@ -21,14 +21,14 @@
  *
  * @category  Form
  * @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 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,10 +39,10 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @category Form
  * @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>
  * @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/
  *
  * @see      SubscribeForm
  */