Merge branch 'diskcache' into 0.9.x

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

diff --git a/lib/feed.php b/lib/feed.php
index 5e0f9add7796dbbdd984b4699b59a4cc60bbfd27..e9fb6fdff3e392620291763044858a603627d834 100644 (file)
--- a/lib/feed.php
+++ b/lib/feed.php
@@ -21,13 +21,13 @@
  *
  * @category  Feed
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @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://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -38,8 +38,8 @@ if (!defined('LACONICA')) {
  *
  * @category Feed
  * @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://status.net/
  */