Merge branch 'geonamesxml' into 0.9.x

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

diff --git a/actions/conversation.php b/actions/conversation.php
index 7f5483ef1e835da7d8c9aa9f9f6133fa5a939562..900a724ef302ac2c14c3be8f9003dc8e0e3f4dd1 100644 (file)
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -6,7 +6,7 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -41,7 +41,7 @@ require_once INSTALLDIR.'/lib/noticelist.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
@@ -130,7 +130,7 @@ class ConversationAction extends Action
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
@@ -251,7 +251,7 @@ class ConversationTree extends NoticeList
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */