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 /actions/sup.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 'actions/sup.php')
-rw-r--r-- | actions/sup.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/sup.php b/actions/sup.php index 5daf0a1c1..a199f247e 100644 --- a/actions/sup.php +++ b/actions/sup.php @@ -61,7 +61,7 @@ class SupAction extends Action $notice = new Notice(); # XXX: cache this. Depends on how big this protocol becomes; - # Re-doing this query every 15 seconds isn't the end of the world. + # Re-doing this query every 15 seconds is not the end of the world. $divider = common_sql_date(time() - $seconds); |