Merge branch '0.8.x' into 0.9.x

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

diff --git a/actions/oembed.php b/actions/oembed.php
index 32365271429a060a72de7cb657c244f4f7016e45..e287b6ae2a9563972ea2dac524bf379a8e789adb 100644 (file)
--- a/actions/oembed.php
+++ b/actions/oembed.php
@@ -21,13 +21,13 @@
  *
  * @category  Twitter
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008 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);
 }