Merge branch 'facebook-js-fix' into testing

2010-01-28 04:47:21 +00:00 · 2010-01-28 04:47:21 +00:00 · 794fe16d69
parent fbd52111e1 c2c262e4b4
commit 794fe16d69
2 changed files with 1 additions and 3 deletions
--- a/plugins/Facebook/facebookaction.php
+++ b/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;
        }

-
-
    }

 }
--- a/plugins/Facebook/facebookapp.js
+++ b/plugins/Facebook/facebookapp.js