diff options
author | Zach Copley <zach@status.net> | 2009-11-10 15:25:43 -0800 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2009-11-10 15:25:43 -0800 |
commit | db64b612961c37477d0729e9ff4f882fb5df7b8d (patch) | |
tree | 9ae5a31b58a289fc838c29c34230edd3962c231f /plugins/Facebook/facebookaction.php | |
parent | ee3fc8ba03ddd8451cac60547af72ea2cef7dc6a (diff) | |
parent | 91332cdadc20e721c22fcf22ca1773cedbde95c5 (diff) |
Merge branch '0.9.x' into finish-account-api
* 0.9.x:
Added a events for the settings menu items
Bringing Sphinx search support up to code: broken out to a plugin, now supports multiple sites on a single server.
Changed to Evan's event style and added an AuthPlugin superclass
add geo output to statuses in json, xml, atom, rss in API
Localisation updates from translatewiki.net (2009-11-10)
Localisation updates from translatewiki.net
Update pot
add lat and long parameters to api/statuses/update
change credential check to work more like other events
fixup output of object attributes in db error code
Performance fix for subscription/subscriber lists based on feedback from ops.
Adjusting indexes to make favorites query more efficient, based on feedback from ops.
Revert untested code; spews PHP notice warnings on every page view: "just sent a http 200 for the check-fancy from install.php"
Added hook for the Group navigation items
Updated block @title text (shouldn't say from group)
Updated group block markup
Revert "Remove more contractions"
Diffstat (limited to 'plugins/Facebook/facebookaction.php')
-rw-r--r-- | plugins/Facebook/facebookaction.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php index 2327694e4..a10fdf90d 100644 --- a/plugins/Facebook/facebookaction.php +++ b/plugins/Facebook/facebookaction.php @@ -95,7 +95,7 @@ class FacebookAction extends Action /** * Start an Facebook ready HTML document * - * For Facebook we do not want to actually output any headers, + * For Facebook we don't want to actually output any headers, * DTD info, etc. Just Stylesheet and JavaScript links. * * @param string $type MIME type to use; default is to do negotation. @@ -129,7 +129,7 @@ class FacebookAction extends Action */ function showNoticeForm() { - // do not do it for most of the Facebook pages + // don't do it for most of the Facebook pages } function showBody() @@ -581,7 +581,7 @@ class FacebookNoticeListItem extends NoticeListItem /** * recipe function for displaying a single notice in the Facebook App. * - * Overridden to strip out some of the controls that we do not + * Overridden to strip out some of the controls that we don't * want to be available. * * @return void |