Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk

diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index a20e618d3a96671406d8208704e7df1b84a2eb9d..2dbe1597086daff4bd79ddc4965a8cc7fdd27117 100644 (file)
--- 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 81737e4d534ba65fc9da0b7a9dc073c3d65f0c60..a2a2d7cb1bdf68d55b08a3010d4afc1d44d9b2f1 100644 (file)
--- 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;
 }