diff options
| author | Zach Copley <zach@status.net> | 2010-01-28 04:47:21 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-01-28 04:47:21 +0000 |
| commit | 794fe16d691b61ef06df6bca0a580460eafa4931 (patch) | |
| tree | 17763639b81593e8f9943638b3596992ffb6e086 | |
| parent | fbd52111e1cc68a1a2710701ae0a146bcce5580e (diff) | |
| parent | c2c262e4b47f5a4965317148b66ff390f4fc85fd (diff) | |
Merge branch 'facebook-js-fix' into testing
| -rw-r--r-- | plugins/Facebook/facebookaction.php | 4 | ||||
| -rw-r--r-- | plugins/Facebook/facebookapp.js (renamed from js/facebookapp.js) | 0 |
2 files changed, 1 insertions, 3 deletions
diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php index 389e1ea81..8437a705a 100644 --- 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; } - - } } diff --git a/js/facebookapp.js b/plugins/Facebook/facebookapp.js index 5deb6e42b..5deb6e42b 100644 --- a/js/facebookapp.js +++ b/plugins/Facebook/facebookapp.js |