Merge branch '1.0.x' into feedsub-wizard

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

diff --git a/actions/attachment_ajax.php b/actions/attachment_ajax.php
index a334cfefba52676681b6040856bc8bedcad47df9..fb7d15f8a2f0806fb07c0a62abed96cd2f7b67ff 100644 (file)
--- a/actions/attachment_ajax.php
+++ b/actions/attachment_ajax.php
@@ -21,13 +21,13 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@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://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -38,11 +38,10 @@ require_once INSTALLDIR.'/actions/attachment.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://laconi.ca/
+ * @link     http://status.net/
  */
-
 class Attachment_ajaxAction extends AttachmentAction
 {
     /**
@@ -80,4 +79,3 @@ class Attachment_ajaxAction extends AttachmentAction
         $this->elementEnd('div');
     }
 }
-