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 /classes/Notice.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 'classes/Notice.php')
-rw-r--r-- | classes/Notice.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index 9886875cb..32a8b693c 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -146,7 +146,7 @@ class Notice extends Memcached_DataObject /* Add them to the database */ foreach(array_unique($hashtags) as $hashtag) { - /* elide characters we don't want in the tag */ + /* elide characters we do not want in the tag */ $this->saveTag($hashtag); } return true; @@ -1105,7 +1105,7 @@ class Notice extends Memcached_DataObject if (empty($recipient)) { continue; } - // Don't save replies from blocked profile to local user + // Do not save replies from blocked profile to local user $recipient_user = User::staticGet('id', $recipient->id); if (!empty($recipient_user) && $recipient_user->hasBlocked($sender)) { continue; @@ -1131,7 +1131,7 @@ class Notice extends Memcached_DataObject $tagged = Profile_tag::getTagged($sender->id, $tag); foreach ($tagged as $t) { if (!$replied[$t->id]) { - // Don't save replies from blocked profile to local user + // Do not save replies from blocked profile to local user $t_user = User::staticGet('id', $t->id); if ($t_user && $t_user->hasBlocked($sender)) { continue; |