diff options
author | Zach Copley <zach@status.net> | 2009-11-10 00:43:58 -0800 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2009-11-10 00:43:58 -0800 |
commit | cae06a49ea60cacb926f27b18b88a8a7f801f011 (patch) | |
tree | 4a1a8b448666f1dd7ff1a8395d7ce75ef4933956 /plugins/Facebook/FacebookPlugin.php | |
parent | dbb86f948684cd5a5a49f6881f50082698fd39d1 (diff) | |
parent | 223fee2ad1430e827830265c9fe97f4d025bb060 (diff) |
Merge branch '0.9.x' into finish-account-api
* 0.9.x: (26 commits)
just sent a http 200 for the check-fancy from install.php
Add a new event: CanUserChangeField
shorten flag notification and include a class
Added flag icon for UserFlag plugin
Fixed notice option alignment in IE
add a method to Theme class to list available themes
Updated Realtime plugin to use the util's NoticeReply object
Localisation updates from translatewiki.net (2009-11-08)
Update pot again
Rebuild pot file *without* --join-existing to get rid of the cruft. Not sure why "--join-existing" must be in. Only thing I can think of is manual additions, which I could not find.
Revert "More precise field label"
Remove more contractions
Revert "* [Cc]an't -> [Cc]annot"
Revert "More specifics on 'address'"
* [Cc]an't -> [Cc]annot
Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"
add utilities for calculating local and installation theme root dirs
Harmonise UI message "No such user."
Restructure theme.php to define a class Theme
entity_action responses look more inactive now
...
Diffstat (limited to 'plugins/Facebook/FacebookPlugin.php')
-rw-r--r-- | plugins/Facebook/FacebookPlugin.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php index b68534b24..cd1ad7b45 100644 --- a/plugins/Facebook/FacebookPlugin.php +++ b/plugins/Facebook/FacebookPlugin.php @@ -182,7 +182,7 @@ class FacebookPlugin extends Plugin $login_url = common_local_url('FBConnectAuth'); $logout_url = common_local_url('logout'); - // XXX: Facebook says we don't need this FB_RequireFeatures(), + // XXX: Facebook says we do not need this FB_RequireFeatures(), // but we actually do, for IE and Safari. Gar. $js = '<script type="text/javascript">'; @@ -201,7 +201,7 @@ class FacebookPlugin extends Plugin // The below function alters the logout link so that it logs the user out // of Facebook Connect as well as the site. However, for some pages // (FB Connect Settings) we need to output the FB Connect scripts (to - // show an existing FB connection even if the user isn't authenticated + // show an existing FB connection even if the user is not authenticated // with Facebook connect) but NOT alter the logout link. And the only // way to reliably do that is with the FB Connect .js libs. Crazy. |