Merge branch 'master' of /var/www/trunk

3 files changed, 3 insertions, 5 deletions

diff --git a/lib/action.php b/lib/action.php
index bf053424f..8f02b36bf 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -158,10 +158,6 @@ class Action extends HTMLOutputter // lawsuit
                                      'media' => 'screen, projection, tv'));
         $this->element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
-                                     'href' => theme_path('css/thickbox.css', 'base') . '?version=' . LACONICA_VERSION,
-                                     'media' => 'screen, projection, tv'));
-        $this->element('link', array('rel' => 'stylesheet',
-                                     'type' => 'text/css',
                                      'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION,
                                      'media' => 'screen, projection, tv'));
         $this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index a20e618d3..2dbe15970 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -68,6 +68,8 @@ class FacebookAction extends Action
             $this->fbuid = $flink->foreign_id; 
             $this->user = $flink->getUser();
         }
+        
+        $this->args = array();
     }
   
     function prepare($argarray)
diff --git a/lib/facebookutil.php b/lib/facebookutil.php
index 81737e4d5..a2a2d7cb1 100644
--- a/lib/facebookutil.php
+++ b/lib/facebookutil.php
@@ -57,7 +57,7 @@ function getFacebookBaseCSS()
 {
     # Add a timestamp to the CSS file so Facebook cache wont ignore our changes
     $ts = filemtime(INSTALLDIR.'/theme/base/css/facebookapp.base.css');
-    $cssurl = INSTALLDIR.'/theme/base/css/facebookapp.base.css' . "?ts=$ts";
+    $cssurl = theme_path('css/facebookapp.base.css', 'base') . "?ts=$ts";
     return $cssurl;
 }