Merge branch 'master' of ../trunk

2 files changed, 10 insertions, 2 deletions

diff --git a/actions/subscribers.php b/actions/subscribers.php
index 408829b54..be9df2b12 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -75,7 +75,11 @@ class SubscribersAction extends GalleryAction
         $offset = ($this->page-1) * PROFILES_PER_PAGE;
         $limit =  PROFILES_PER_PAGE + 1;
 
-        $subscribers = $this->user->getSubscribers($offset, $limit);
+        if ($this->tag) {
+            $subscribers = $this->user->getTaggedSubscribers($this->tag, $offset, $limit);
+        } else {
+            $subscribers = $this->user->getSubscribers($offset, $limit);
+        }
 
         if ($subscribers) {
             $subscribers_list = new SubscribersList($subscribers, $this->user, $this);
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index bcc557891..d7ba0d624 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -84,7 +84,11 @@ class SubscriptionsAction extends GalleryAction
         $offset = ($this->page-1) * PROFILES_PER_PAGE;
         $limit =  PROFILES_PER_PAGE + 1;
 
-        $subscriptions = $this->user->getSubscriptions($offset, $limit);
+        if ($this->tag) {
+            $subscriptions = $this->user->getTaggedSubscriptions($this->tag, $offset, $limit);
+        } else {
+            $subscriptions = $this->user->getSubscriptions($offset, $limit);
+        }
 
         if ($subscriptions) {
             $subscriptions_list = new SubscriptionsList($subscriptions, $this->user, $this);