diff options
| author | Zach Copley <zach@status.net> | 2010-07-29 20:44:11 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-07-29 20:44:11 +0000 |
| commit | fb2e00eacc7090df0d05311e39f08cb72164a78c (patch) | |
| tree | 7a3d33d537d9c2bcd5f2c8c58ed38790e1e7c248 /classes | |
| parent | fadeafbccc804063240c4f799a29e3ffa04b73e7 (diff) | |
| parent | 0faa988e91056564b2ae19f045a81b322cce4e0c (diff) | |
Merge branch 'master' into 0.9.x
Conflicts:
classes/Notice.php
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/Notice.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index 606803b6f..12467c850 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -281,8 +281,9 @@ class Notice extends Memcached_DataObject if (!$profile->hasRight(Right::NEWNOTICE)) { common_log(LOG_WARNING, "Attempted post from user disallowed to post: " . $profile->nickname); + // TRANS: Client exception thrown when a user tries to post while being banned. - throw new ClientException(_('You are banned from posting notices on this site.')); + throw new ClientException(_('You are banned from posting notices on this site.'), 403); } $notice = new Notice(); |