Merge branch '0.8.x' of git://gitorious.org/~brion/statusnet/brion-fixes into 0.8.x

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

diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index 753447f8b60f5468b8e01a153b5a6c41acbc5ede..5cbb9be5312bf2ff50907cbc06dd41b31cc5a342 100644 (file)
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -21,13 +21,13 @@
  *
  * @category  Faceboook
  * @package   StatusNet
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Zach Copley <zach@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);
 }
@@ -96,6 +96,7 @@ class FacebookAction extends Action
     function showStylesheets()
     {
         $this->cssLink('css/display.css', 'base');
+        $this->cssLink('css/display.css',null,'screen, projection, tv');
         $this->cssLink('css/facebookapp.css', 'base');
     }
 
@@ -373,7 +374,7 @@ class FacebookAction extends Action
          display:inline-block;
          }
 
-     #facebook_laconica_app {
+     #facebook_statusnet_app {
      text-indent:-9999px;
      height:16px;
      width:16px;
@@ -672,7 +673,7 @@ class FacebookProfileBoxNotice extends FacebookNoticeListItem
         $this->app_uri = 'http://apps.facebook.com/' . $app_props['canvas_name'];
         $this->app_name = $app_props['application_name'];
 
-        $this->out->elementStart('a', array('id' => 'facebook_laconica_app',
+        $this->out->elementStart('a', array('id' => 'facebook_statusnet_app',
                                             'href' => $this->app_uri));
         $this->out->text($this->app_name);
         $this->out->elementEnd('a');