summaryrefslogtreecommitdiff
path: root/plugins/Facebook/facebook/facebook.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-11-10 14:26:49 -0500
committerEvan Prodromou <evan@status.net>2009-11-10 14:26:49 -0500
commit7ae10c27b0725a7108b63a788affd4d07e37afdc (patch)
tree92f952319071ba770136d3e69a82e51040ecb6b5 /plugins/Facebook/facebook/facebook.php
parent8d5c2b3129a1d7cefd78e311d5cbbe9ab426bb72 (diff)
parent737fe763471bcb6ebd95c318363308a33e28e889 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts: lib/util.php
Diffstat (limited to 'plugins/Facebook/facebook/facebook.php')
-rw-r--r--plugins/Facebook/facebook/facebook.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/Facebook/facebook/facebook.php b/plugins/Facebook/facebook/facebook.php
index 7b0107788..016e8e8e0 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 does not have one, but
+ * if the user doesn't 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 do not have a logged in user, otherwise who
+ // API_EC_PARAM means we don't 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 do not have a logged in user, otherwise who
+ // API_EC_PARAM means we don't 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 do not
+ // make sure facebook.com url's load in the full frame so that we don't
// get a frame within a frame.
echo "<script type=\"text/javascript\">\ntop.location.href = \"$url\";\n</script>";
} else {