From: Zach Copley <zach@status.net>
Date: Thu, 29 Jul 2010 20:44:11 +0000 (+0000)
Subject: Merge branch 'master' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fb2e00eacc7090df0d05311e39f08cb72164a78c;p=quix0rs-gnu-social.git

Merge branch 'master' into 0.9.x

Conflicts:
	classes/Notice.php
---

fb2e00eacc7090df0d05311e39f08cb72164a78c
diff --cc classes/Notice.php
index 606803b6f9,36943be84b..12467c8501
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@@ -281,8 -275,7 +281,9 @@@ class Notice extends Memcached_DataObje
  
          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();