block subscribes by silenced users

2 files changed, 8 insertions, 0 deletions

diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index a4ea5ad4d..b04bcbb8b 100644
--- a/lib/oauthstore.php
+++ b/lib/oauthstore.php
@@ -462,6 +462,10 @@ class StatusNetOAuthDataStore extends OAuthDataStore
         $subscribed = $this->_getAnyProfile($subscribed_user_uri);
         $subscriber = $this->_getAnyProfile($subscriber_uri);
 
+        if (!$subscriber->hasRight(Right::SUBSCRIBE)) {
+            return _('You have been banned from subscribing.');
+        }
+
         $sub->subscribed = $subscribed->id;
         $sub->subscriber = $subscriber->id;
 
diff --git a/lib/subs.php b/lib/subs.php
index 2f0f97049..2fc3160de 100644
--- a/lib/subs.php
+++ b/lib/subs.php
@@ -44,6 +44,10 @@ function subs_subscribe_user($user, $other_nickname)
 
 function subs_subscribe_to($user, $other)
 {
+    if (!$user->hasRight(Right::SUBSCRIBE)) {
+        return _('You have been banned from subscribing.');
+    }
+
     if ($user->isSubscribed($other)) {
         return _('Already subscribed!');
     }