Merge branch 'master' of gitorious.org:social/mainline

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

diff --git a/lib/parallelizingdaemon.php b/lib/parallelizingdaemon.php
index 8e09a3a411a3e25cbf9f75b2445aec159378b1f2..517115de0497521448c5abdd214f11bee9a29f3e 100644 (file)
--- a/lib/parallelizingdaemon.php
+++ b/lib/parallelizingdaemon.php
@@ -21,14 +21,14 @@
  *
  * @category  Daemon
  * @package   StatusNet
- * @author    Zach Copley <zach@controlyourself.ca>
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Zach Copley <zach@status.net>
+ * @author    Evan Prodromou <evan@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 @@ declare(ticks = 1);
  *
  * @category Daemon
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
+ * @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://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ParallelizingDaemon extends Daemon