block subscribes by silenced users

diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index a4ea5ad4d0eccaa1eb9fa65541ab85748a1a2023..b04bcbb8b29896a922ceb651587fccdb7f9d0f1d 100644 (file)
--- 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 2f0f970495eb5159dd174635a85a806138793a20..2fc3160dec5e9d01de6a885766706b33587890f0 100644 (file)
--- 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!');
     }