Merge branch 'master' into 0.9.x

Conflicts:
	classes/Notice.php
This commit is contained in:
Zach Copley
2010-07-29 20:44:11 +00:00
6 changed files with 24 additions and 16 deletions

View File

@@ -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();