diff options
author | Evan Prodromou <evan@status.net> | 2009-11-08 21:23:25 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-11-08 21:23:25 -0500 |
commit | aa0d9a86152d2485de6de5ec572ae87085ebe780 (patch) | |
tree | be142ab0f12a2e580aa36de31e0ceddadd0158b5 /plugins/Facebook/facebook/facebook.php | |
parent | f086dddf43a8e1593a615e77c2fdd605623acf49 (diff) | |
parent | 8e58f241739b97bd53f78035781f16e2067a31d9 (diff) |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/Facebook/facebook/facebook.php')
-rw-r--r-- | plugins/Facebook/facebook/facebook.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/Facebook/facebook/facebook.php b/plugins/Facebook/facebook/facebook.php index 016e8e8e0..7b0107788 100644 --- a/plugins/Facebook/facebook/facebook.php +++ b/plugins/Facebook/facebook/facebook.php @@ -57,7 +57,7 @@ class Facebook { * @param api_key your Developer API key * @param secret your Developer API secret * @param generate_session_secret whether to automatically generate a session - * if the user doesn't have one, but + * if the user does not have one, but * there is an auth token present in the url, */ public function __construct($api_key, $secret, $generate_session_secret=false) { @@ -192,7 +192,7 @@ class Facebook { } return $session_secret; } catch (FacebookRestClientException $e) { - // API_EC_PARAM means we don't have a logged in user, otherwise who + // API_EC_PARAM means we do not have a logged in user, otherwise who // knows what it means, so just throw it. if ($e->getCode() != FacebookAPIErrorCodes::API_EC_PARAM) { throw $e; @@ -204,7 +204,7 @@ class Facebook { try { return $this->api_client->auth_getSession($auth_token, $this->generate_session_secret); } catch (FacebookRestClientException $e) { - // API_EC_PARAM means we don't have a logged in user, otherwise who + // API_EC_PARAM means we do not have a logged in user, otherwise who // knows what it means, so just throw it. if ($e->getCode() != FacebookAPIErrorCodes::API_EC_PARAM) { throw $e; @@ -265,7 +265,7 @@ class Facebook { if ($this->in_fb_canvas()) { echo '<fb:redirect url="' . $url . '"/>'; } else if (preg_match('/^https?:\/\/([^\/]*\.)?facebook\.com(:\d+)?/i', $url)) { - // make sure facebook.com url's load in the full frame so that we don't + // make sure facebook.com url's load in the full frame so that we do not // get a frame within a frame. echo "<script type=\"text/javascript\">\ntop.location.href = \"$url\";\n</script>"; } else { |