diff options
| author | Evan Prodromou <evan@status.net> | 2009-12-22 16:44:19 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-12-22 16:44:19 -0800 |
| commit | f6bf9529805cd58fdd1671dd9b133bde05e8ae87 (patch) | |
| tree | cf272bd1105da48f016b635db4d9c34810adcbda /plugins/Facebook/FacebookPlugin.php | |
| parent | f987273f118a12d443b6789c2ab59d7a4b01f678 (diff) | |
| parent | 30c2e2ce83282f0bc268153d7ec465fbb5cf00ca (diff) | |
Merge branch 'testing'
Diffstat (limited to 'plugins/Facebook/FacebookPlugin.php')
| -rw-r--r-- | plugins/Facebook/FacebookPlugin.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php index 047477d9c..39b2ef287 100644 --- a/plugins/Facebook/FacebookPlugin.php +++ b/plugins/Facebook/FacebookPlugin.php @@ -185,7 +185,6 @@ class FacebookPlugin extends Plugin // XXX: Facebook says we don't need this FB_RequireFeatures(), // but we actually do, for IE and Safari. Gar. - $js = '<script type="text/javascript">'; $js .= ' $(document).ready(function () {'; $js .= ' FB_RequireFeatures('; $js .= ' ["XFBML"], function() {'; @@ -219,7 +218,6 @@ class FacebookPlugin extends Plugin $js .= ' }'; $js .= ' );'; $js .= ' });'; - $js .= '</script>'; $js = sprintf($js, $apikey, $login_url, $logout_url); @@ -227,7 +225,7 @@ class FacebookPlugin extends Plugin $js = str_replace(' ', '', $js); - $action->raw(" $js"); // leading two spaces to make it line up + $action->inlineScript($js); } } @@ -408,9 +406,9 @@ class FacebookPlugin extends Plugin $action_name = $action->trimmed('action'); $action->menuItem(common_local_url('FBConnectLogin'), - _('Facebook'), - _('Login or register using Facebook'), - 'FBConnectLogin' === $action_name); + _m('Facebook'), + _m('Login or register using Facebook'), + 'FBConnectLogin' === $action_name); return true; } @@ -428,8 +426,8 @@ class FacebookPlugin extends Plugin $action_name = $action->trimmed('action'); $action->menuItem(common_local_url('FBConnectSettings'), - _('Facebook'), - _('Facebook Connect Settings'), + _m('Facebook'), + _m('Facebook Connect Settings'), $action_name === 'FBConnectSettings'); return true; |