Merge branch 'facebook-js-fix' into testing

plugins/Facebook/facebookaction.php

@@ -89,7 +89,7 @@ class FacebookAction extends Action
 
     function showScripts()
     {
-        $this->script('facebookapp.js');
+        $this->script(common_path('plugins/Facebook/facebookapp.js'));
     }
 
     /**
@@ -397,8 +397,6 @@ class FacebookAction extends Action
             return;
         }
 
-
-
     }
 
 }