diff options
author | Evan Prodromou <evan@status.net> | 2009-12-08 14:43:21 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-12-08 14:43:21 -0500 |
commit | 78fc9483d4d1fde4561905edf6594b86c4dc374e (patch) | |
tree | 7172cabba4c36bb3a7bd00a78ab09f1791a9a60c /plugins/Facebook | |
parent | 75b11527c7efb1d3d9c7d53b99d80480ce06a9f5 (diff) | |
parent | 3536f01258dc43bee764c98fbdda5a6f1df7bcb2 (diff) |
Merge branch '0.9.x' into testing
Diffstat (limited to 'plugins/Facebook')
-rw-r--r-- | plugins/Facebook/FacebookPlugin.php | 4 | ||||
-rw-r--r-- | plugins/Facebook/facebookaction.php | 2 | ||||
-rw-r--r-- | plugins/Facebook/facebookutil.php | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php index 047477d9c..40c911cce 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); } } diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php index c852bbf5e..b090e9bd9 100644 --- a/plugins/Facebook/facebookaction.php +++ b/plugins/Facebook/facebookaction.php @@ -44,7 +44,7 @@ class FacebookAction extends Action var $app_uri = null; var $app_name = null; - function __construct($output='php://output', $indent=true, $facebook=null, $flink=null) + function __construct($output='php://output', $indent=null, $facebook=null, $flink=null) { parent::__construct($output, $indent); diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php index 6f50c173a..2abcbb14e 100644 --- a/plugins/Facebook/facebookutil.php +++ b/plugins/Facebook/facebookutil.php @@ -168,7 +168,7 @@ function facebookBroadcastNotice($notice) function updateProfileBox($facebook, $flink, $notice) { $fbaction = new FacebookAction($output = 'php://output', - $indent = true, $facebook, $flink); + $indent = null, $facebook, $flink); $fbaction->updateProfileBox($notice); } |