diff options
| author | Robin Millette <millette@plantard.controlezvous.ca> | 2009-01-23 01:01:01 +0000 |
|---|---|---|
| committer | Robin Millette <millette@plantard.controlezvous.ca> | 2009-01-23 01:01:01 +0000 |
| commit | 8a65c5175c3b734d4c53d6a3c3af51c5a645dff2 (patch) | |
| tree | 6e85645d2e51d517f88413c119ddc4eed26f633b /actions/subscriptions.php | |
| parent | 4a4efc3b0a453a0e345f4ec5bd8e970130589ae6 (diff) | |
| parent | 1132e66f84c188f8267165d99d95d04047b6b23b (diff) | |
Merge branch 'master' of /var/www/trunk
Diffstat (limited to 'actions/subscriptions.php')
| -rw-r--r-- | actions/subscriptions.php | 6 |
1 files changed, 5 insertions, 1 deletions
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); |